X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssimagegradient.c;h=cc06c904c9533f243301c8db75a6b69d73685c7c;hb=aaedf5a35219b034a244730564b8fdf2b7d32540;hp=f56dd4b9bc0e5ee428b6f6a71ed962615eb161f2;hpb=f7eea0b86e24ee60957c86d7dd6ab1d031211bab;p=~andy%2Fgtk
diff --git a/gtk/gtkcssimagegradient.c b/gtk/gtkcssimagegradient.c
index f56dd4b9b..cc06c904c 100644
--- a/gtk/gtkcssimagegradient.c
+++ b/gtk/gtkcssimagegradient.c
@@ -12,23 +12,31 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library. If not, see .
*
* Authors: Benjamin Otte
*/
#include "config.h"
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
#include "gtkcssimagegradientprivate.h"
#include "gtkcssprovider.h"
+#include "deprecated/gtkgradientprivate.h"
+#include "deprecated/gtksymboliccolorprivate.h"
+
G_DEFINE_TYPE (GtkCssImageGradient, _gtk_css_image_gradient, GTK_TYPE_CSS_IMAGE)
static GtkCssImage *
-gtk_css_image_gradient_compute (GtkCssImage *image,
- GtkStyleContext *context)
+gtk_css_image_gradient_compute (GtkCssImage *image,
+ guint property_id,
+ GtkStyleProviderPrivate *provider,
+ GtkCssComputedValues *values,
+ GtkCssComputedValues *parent_values,
+ GtkCssDependencies *dependencies)
{
GtkCssImageGradient *gradient = GTK_CSS_IMAGE_GRADIENT (image);
GtkCssImageGradient *copy;
@@ -38,11 +46,189 @@ gtk_css_image_gradient_compute (GtkCssImage *image,
copy = g_object_new (GTK_TYPE_CSS_IMAGE_GRADIENT, NULL);
copy->gradient = gtk_gradient_ref (gradient->gradient);
- copy->pattern = gtk_gradient_resolve_for_context (copy->gradient, context);
+ copy->pattern = _gtk_gradient_resolve_full (copy->gradient, provider, values, parent_values, dependencies);
return GTK_CSS_IMAGE (copy);
}
+static cairo_pattern_t *
+fade_pattern (cairo_pattern_t *pattern,
+ double opacity)
+{
+ double x0, y0, x1, y1, r0, r1;
+ cairo_pattern_t *result;
+ int i, n;
+
+ switch (cairo_pattern_get_type (pattern))
+ {
+ case CAIRO_PATTERN_TYPE_LINEAR:
+ cairo_pattern_get_linear_points (pattern, &x0, &y0, &x1, &y1);
+ result = cairo_pattern_create_linear (x0, y0, x1, y1);
+ break;
+ case CAIRO_PATTERN_TYPE_RADIAL:
+ cairo_pattern_get_radial_circles (pattern, &x0, &y0, &r0, &x1, &y1, &r1);
+ result = cairo_pattern_create_radial (x0, y0, r0, x1, y1, r1);
+ break;
+ default:
+ g_return_val_if_reached (NULL);
+ }
+
+ cairo_pattern_get_color_stop_count (pattern, &n);
+ for (i = 0; i < n; i++)
+ {
+ double o, r, g, b, a;
+
+ cairo_pattern_get_color_stop_rgba (pattern, i, &o, &r, &g, &b, &a);
+ cairo_pattern_add_color_stop_rgba (result, o, r, g, b, a * opacity);
+ }
+
+ return result;
+}
+
+static cairo_pattern_t *
+transition_pattern (cairo_pattern_t *start,
+ cairo_pattern_t *end,
+ double progress)
+{
+ double sx0, sy0, sx1, sy1, sr0, sr1, ex0, ey0, ex1, ey1, er0, er1;
+ cairo_pattern_t *result;
+ int i, n;
+
+ progress = CLAMP (progress, 0.0, 1.0);
+
+ if (end == NULL)
+ return fade_pattern (start, 1.0 - progress);
+
+ g_assert (cairo_pattern_get_type (start) == cairo_pattern_get_type (end));
+
+ switch (cairo_pattern_get_type (start))
+ {
+ case CAIRO_PATTERN_TYPE_LINEAR:
+ cairo_pattern_get_linear_points (start, &sx0, &sy0, &sx1, &sy1);
+ cairo_pattern_get_linear_points (end, &ex0, &ey0, &ex1, &ey1);
+ result = cairo_pattern_create_linear ((1 - progress) * sx0 + progress * ex0,
+ (1 - progress) * sx1 + progress * ex1,
+ (1 - progress) * sy0 + progress * ey0,
+ (1 - progress) * sy1 + progress * ey1);
+ break;
+ case CAIRO_PATTERN_TYPE_RADIAL:
+ cairo_pattern_get_radial_circles (start, &sx0, &sy0, &sr0, &sx1, &sy1, &sr1);
+ cairo_pattern_get_radial_circles (end, &ex0, &ey0, &er0, &ex1, &ey1, &er1);
+ result = cairo_pattern_create_radial ((1 - progress) * sx0 + progress * ex0,
+ (1 - progress) * sy0 + progress * ey0,
+ (1 - progress) * sr0 + progress * er0,
+ (1 - progress) * sx1 + progress * ex1,
+ (1 - progress) * sy1 + progress * ey1,
+ (1 - progress) * sr1 + progress * er1);
+ break;
+ default:
+ g_return_val_if_reached (NULL);
+ }
+
+ cairo_pattern_get_color_stop_count (start, &n);
+ for (i = 0; i < n; i++)
+ {
+ double so, sr, sg, sb, sa, eo, er, eg, eb, ea;
+
+ cairo_pattern_get_color_stop_rgba (start, i, &so, &sr, &sg, &sb, &sa);
+ cairo_pattern_get_color_stop_rgba (end, i, &eo, &er, &eg, &eb, &ea);
+
+ cairo_pattern_add_color_stop_rgba (result,
+ (1 - progress) * so + progress * eo,
+ (1 - progress) * sr + progress * er,
+ (1 - progress) * sg + progress * eg,
+ (1 - progress) * sb + progress * eb,
+ (1 - progress) * sa + progress * ea);
+ }
+
+ return result;
+}
+
+static GtkCssImage *
+gtk_css_image_gradient_transition (GtkCssImage *start_image,
+ GtkCssImage *end_image,
+ guint property_id,
+ double progress)
+{
+ GtkGradient *start_gradient, *end_gradient, *gradient;
+ cairo_pattern_t *start_pattern, *end_pattern;
+ GtkCssImageGradient *result;
+
+ start_gradient = GTK_CSS_IMAGE_GRADIENT (start_image)->gradient;
+ start_pattern = GTK_CSS_IMAGE_GRADIENT (start_image)->pattern;
+ if (end_image == NULL)
+ {
+ end_gradient = NULL;
+ end_pattern = NULL;
+ }
+ else
+ {
+ if (!GTK_IS_CSS_IMAGE_GRADIENT (end_image))
+ return GTK_CSS_IMAGE_CLASS (_gtk_css_image_gradient_parent_class)->transition (start_image, end_image, property_id, progress);
+
+ end_gradient = GTK_CSS_IMAGE_GRADIENT (end_image)->gradient;
+ end_pattern = GTK_CSS_IMAGE_GRADIENT (end_image)->pattern;
+ }
+
+ gradient = _gtk_gradient_transition (start_gradient, end_gradient, property_id, progress);
+ if (gradient == NULL)
+ return GTK_CSS_IMAGE_CLASS (_gtk_css_image_gradient_parent_class)->transition (start_image, end_image, property_id, progress);
+
+ result = g_object_new (GTK_TYPE_CSS_IMAGE_GRADIENT, NULL);
+ result->gradient = gradient;
+ result->pattern = transition_pattern (start_pattern, end_pattern, progress);
+
+ return GTK_CSS_IMAGE (result);
+}
+
+static gboolean
+gtk_css_image_gradient_draw_circle (GtkCssImageGradient *image,
+ cairo_t *cr,
+ double width,
+ double height)
+{
+ cairo_pattern_t *pattern = image->pattern;
+ double x0, y0, x1, y1, r0, r1;
+ GdkRGBA color0, color1;
+ double offset0, offset1;
+ int n_stops;
+
+ if (cairo_pattern_get_type (pattern) != CAIRO_PATTERN_TYPE_RADIAL)
+ return FALSE;
+ if (cairo_pattern_get_extend (pattern) != CAIRO_EXTEND_PAD)
+ return FALSE;
+
+ cairo_pattern_get_radial_circles (pattern, &x0, &y0, &r0, &x1, &y1, &r1);
+
+ if (x0 != x1 ||
+ y0 != y1 ||
+ r0 != 0.0)
+ return FALSE;
+
+ cairo_pattern_get_color_stop_count (pattern, &n_stops);
+ if (n_stops != 2)
+ return FALSE;
+
+ cairo_pattern_get_color_stop_rgba (pattern, 0, &offset0, &color0.red, &color0.green, &color0.blue, &color0.alpha);
+ cairo_pattern_get_color_stop_rgba (pattern, 1, &offset1, &color1.red, &color1.green, &color1.blue, &color1.alpha);
+ if (offset0 != offset1)
+ return FALSE;
+
+ cairo_scale (cr, width, height);
+
+ cairo_rectangle (cr, 0, 0, 1, 1);
+ cairo_clip (cr);
+
+ gdk_cairo_set_source_rgba (cr, &color1);
+ cairo_paint (cr);
+
+ gdk_cairo_set_source_rgba (cr, &color0);
+ cairo_arc (cr, x1, y1, r1 * offset1, 0, 2 * G_PI);
+ cairo_fill (cr);
+
+ return TRUE;
+}
+
static void
gtk_css_image_gradient_draw (GtkCssImage *image,
cairo_t *cr,
@@ -57,6 +243,9 @@ gtk_css_image_gradient_draw (GtkCssImage *image,
return;
}
+ if (gtk_css_image_gradient_draw_circle (gradient, cr, width, height))
+ return;
+
cairo_scale (cr, width, height);
cairo_rectangle (cr, 0, 0, 1, 1);
@@ -66,8 +255,7 @@ gtk_css_image_gradient_draw (GtkCssImage *image,
static gboolean
gtk_css_image_gradient_parse (GtkCssImage *image,
- GtkCssParser *parser,
- GFile *base)
+ GtkCssParser *parser)
{
GtkCssImageGradient *gradient = GTK_CSS_IMAGE_GRADIENT (image);
@@ -114,6 +302,7 @@ _gtk_css_image_gradient_class_init (GtkCssImageGradientClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
image_class->compute = gtk_css_image_gradient_compute;
+ image_class->transition = gtk_css_image_gradient_transition;
image_class->draw = gtk_css_image_gradient_draw;
image_class->parse = gtk_css_image_gradient_parse;
image_class->print = gtk_css_image_gradient_print;
@@ -288,7 +477,7 @@ _gtk_gradient_parse (GtkCssParser *parser)
return NULL;
}
- color = _gtk_css_parser_read_symbolic_color (parser);
+ color = _gtk_css_symbolic_value_new (parser);
if (color == NULL)
{
gtk_gradient_unref (gradient);