mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-17 23:10:22 +00:00
theme: Apply background merging code
It was unused and untested and did not do at all what the CSS spec says.
This commit is contained in:
Benjamin Otte
parent
0bc170cd84
commit
a35df38443
@ -39,189 +39,6 @@ _gtk_theming_background_apply_window_background (GtkThemingBackground *bg,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_gtk_theming_background_apply_running_transformation (GtkThemingBackground *bg,
|
|
||||||
cairo_t *cr)
|
|
||||||
{
|
|
||||||
gboolean running;
|
|
||||||
gdouble progress;
|
|
||||||
cairo_pattern_t *other_pattern;
|
|
||||||
GtkStateFlags other_flags;
|
|
||||||
GdkRGBA other_bg;
|
|
||||||
cairo_pattern_t *new_pattern = NULL;
|
|
||||||
|
|
||||||
running = gtk_theming_engine_state_is_running (bg->engine, GTK_STATE_PRELIGHT, &progress);
|
|
||||||
|
|
||||||
if (!running)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (bg->flags & GTK_STATE_FLAG_PRELIGHT)
|
|
||||||
{
|
|
||||||
other_flags = bg->flags & ~(GTK_STATE_FLAG_PRELIGHT);
|
|
||||||
progress = 1 - progress;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
other_flags = bg->flags | GTK_STATE_FLAG_PRELIGHT;
|
|
||||||
|
|
||||||
gtk_theming_engine_get_background_color (bg->engine, other_flags, &other_bg);
|
|
||||||
gtk_theming_engine_get (bg->engine, other_flags,
|
|
||||||
"background-image", &other_pattern,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
if (bg->pattern && other_pattern)
|
|
||||||
{
|
|
||||||
cairo_pattern_type_t type, other_type;
|
|
||||||
gint n0, n1;
|
|
||||||
|
|
||||||
cairo_pattern_get_color_stop_count (bg->pattern, &n0);
|
|
||||||
cairo_pattern_get_color_stop_count (other_pattern, &n1);
|
|
||||||
type = cairo_pattern_get_type (bg->pattern);
|
|
||||||
other_type = cairo_pattern_get_type (other_pattern);
|
|
||||||
|
|
||||||
if (type == other_type && n0 == n1)
|
|
||||||
{
|
|
||||||
gdouble offset0, red0, green0, blue0, alpha0;
|
|
||||||
gdouble offset1, red1, green1, blue1, alpha1;
|
|
||||||
gdouble x00, x01, y00, y01, x10, x11, y10, y11;
|
|
||||||
gdouble r00, r01, r10, r11;
|
|
||||||
guint i;
|
|
||||||
|
|
||||||
if (type == CAIRO_PATTERN_TYPE_LINEAR)
|
|
||||||
{
|
|
||||||
cairo_pattern_get_linear_points (bg->pattern, &x00, &y00, &x01, &y01);
|
|
||||||
cairo_pattern_get_linear_points (other_pattern, &x10, &y10, &x11, &y11);
|
|
||||||
|
|
||||||
new_pattern = cairo_pattern_create_linear (x00 + (x10 - x00) * progress,
|
|
||||||
y00 + (y10 - y00) * progress,
|
|
||||||
x01 + (x11 - x01) * progress,
|
|
||||||
y01 + (y11 - y01) * progress);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cairo_pattern_get_radial_circles (bg->pattern, &x00, &y00, &r00, &x01, &y01, &r01);
|
|
||||||
cairo_pattern_get_radial_circles (other_pattern, &x10, &y10, &r10, &x11, &y11, &r11);
|
|
||||||
|
|
||||||
new_pattern = cairo_pattern_create_radial (x00 + (x10 - x00) * progress,
|
|
||||||
y00 + (y10 - y00) * progress,
|
|
||||||
r00 + (r10 - r00) * progress,
|
|
||||||
x01 + (x11 - x01) * progress,
|
|
||||||
y01 + (y11 - y01) * progress,
|
|
||||||
r01 + (r11 - r01) * progress);
|
|
||||||
}
|
|
||||||
|
|
||||||
cairo_pattern_set_filter (new_pattern, CAIRO_FILTER_FAST);
|
|
||||||
i = 0;
|
|
||||||
|
|
||||||
/* Blend both gradients into one */
|
|
||||||
while (i < n0 && i < n1)
|
|
||||||
{
|
|
||||||
cairo_pattern_get_color_stop_rgba (bg->pattern, i,
|
|
||||||
&offset0,
|
|
||||||
&red0, &green0, &blue0,
|
|
||||||
&alpha0);
|
|
||||||
cairo_pattern_get_color_stop_rgba (other_pattern, i,
|
|
||||||
&offset1,
|
|
||||||
&red1, &green1, &blue1,
|
|
||||||
&alpha1);
|
|
||||||
|
|
||||||
cairo_pattern_add_color_stop_rgba (new_pattern,
|
|
||||||
offset0 + ((offset1 - offset0) * progress),
|
|
||||||
red0 + ((red1 - red0) * progress),
|
|
||||||
green0 + ((green1 - green0) * progress),
|
|
||||||
blue0 + ((blue1 - blue0) * progress),
|
|
||||||
alpha0 + ((alpha1 - alpha0) * progress));
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cairo_save (cr);
|
|
||||||
|
|
||||||
cairo_rectangle (cr, 0, 0, bg->paint_area.width, bg->paint_area.height);
|
|
||||||
cairo_clip (cr);
|
|
||||||
|
|
||||||
cairo_push_group (cr);
|
|
||||||
|
|
||||||
cairo_scale (cr, bg->paint_area.width, bg->paint_area.height);
|
|
||||||
cairo_set_source (cr, other_pattern);
|
|
||||||
cairo_paint_with_alpha (cr, progress);
|
|
||||||
cairo_set_source (cr, bg->pattern);
|
|
||||||
cairo_paint_with_alpha (cr, 1.0 - progress);
|
|
||||||
|
|
||||||
new_pattern = cairo_pop_group (cr);
|
|
||||||
|
|
||||||
cairo_restore (cr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (bg->pattern || other_pattern)
|
|
||||||
{
|
|
||||||
cairo_pattern_t *p;
|
|
||||||
const GdkRGBA *c;
|
|
||||||
gdouble x0, y0, x1, y1, r0, r1;
|
|
||||||
gint n, i;
|
|
||||||
|
|
||||||
/* Blend a pattern with a color */
|
|
||||||
if (bg->pattern)
|
|
||||||
{
|
|
||||||
p = bg->pattern;
|
|
||||||
c = &other_bg;
|
|
||||||
progress = 1 - progress;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
p = other_pattern;
|
|
||||||
c = &bg->bg_color;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cairo_pattern_get_type (p) == CAIRO_PATTERN_TYPE_LINEAR)
|
|
||||||
{
|
|
||||||
cairo_pattern_get_linear_points (p, &x0, &y0, &x1, &y1);
|
|
||||||
new_pattern = cairo_pattern_create_linear (x0, y0, x1, y1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cairo_pattern_get_radial_circles (p, &x0, &y0, &r0, &x1, &y1, &r1);
|
|
||||||
new_pattern = cairo_pattern_create_radial (x0, y0, r0, x1, y1, r1);
|
|
||||||
}
|
|
||||||
|
|
||||||
cairo_pattern_get_color_stop_count (p, &n);
|
|
||||||
|
|
||||||
for (i = 0; i < n; i++)
|
|
||||||
{
|
|
||||||
gdouble red1, green1, blue1, alpha1;
|
|
||||||
gdouble offset;
|
|
||||||
|
|
||||||
cairo_pattern_get_color_stop_rgba (p, i,
|
|
||||||
&offset,
|
|
||||||
&red1, &green1, &blue1,
|
|
||||||
&alpha1);
|
|
||||||
cairo_pattern_add_color_stop_rgba (new_pattern, offset,
|
|
||||||
c->red + ((red1 - c->red) * progress),
|
|
||||||
c->green + ((green1 - c->green) * progress),
|
|
||||||
c->blue + ((blue1 - c->blue) * progress),
|
|
||||||
c->alpha + ((alpha1 - c->alpha) * progress));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* Merge just colors */
|
|
||||||
new_pattern = cairo_pattern_create_rgba (CLAMP (bg->bg_color.red + ((other_bg.red - bg->bg_color.red) * progress), 0, 1),
|
|
||||||
CLAMP (bg->bg_color.green + ((other_bg.green - bg->bg_color.green) * progress), 0, 1),
|
|
||||||
CLAMP (bg->bg_color.blue + ((other_bg.blue - bg->bg_color.blue) * progress), 0, 1),
|
|
||||||
CLAMP (bg->bg_color.alpha + ((other_bg.alpha - bg->bg_color.alpha) * progress), 0, 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (new_pattern)
|
|
||||||
{
|
|
||||||
/* Replace pattern to use */
|
|
||||||
cairo_pattern_destroy (bg->pattern);
|
|
||||||
bg->pattern = new_pattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (other_pattern)
|
|
||||||
cairo_pattern_destroy (other_pattern);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_gtk_theming_background_apply_origin (GtkThemingBackground *bg)
|
_gtk_theming_background_apply_origin (GtkThemingBackground *bg)
|
||||||
{
|
{
|
||||||
@ -424,7 +241,6 @@ _gtk_theming_background_render (GtkThemingBackground *bg,
|
|||||||
cairo_translate (cr, bg->paint_area.x, bg->paint_area.y);
|
cairo_translate (cr, bg->paint_area.x, bg->paint_area.y);
|
||||||
|
|
||||||
_gtk_theming_background_apply_window_background (bg, cr);
|
_gtk_theming_background_apply_window_background (bg, cr);
|
||||||
_gtk_theming_background_apply_running_transformation (bg, cr);
|
|
||||||
_gtk_theming_background_paint (bg, cr);
|
_gtk_theming_background_paint (bg, cr);
|
||||||
_gtk_theming_background_apply_shadow (bg, cr);
|
_gtk_theming_background_apply_shadow (bg, cr);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user