diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-08-29 14:48:29 -0700 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2014-10-03 06:18:04 +0200 |
| commit | 763aa4db948fd80736a26aa40819c189951d4203 (patch) | |
| tree | c1702a40769aa487f6b92b15e9cb4f7336acc757 | |
| parent | 6556e7e08de0cc9e66e83a22b4250f9d14ec4cdc (diff) | |
| download | gtk+-763aa4db948fd80736a26aa40819c189951d4203.tar.gz | |
cssshadowvalue: Move the check for blurring into its own function
This makes it easier to update the check later.
| -rw-r--r-- | gtk/gtkcssshadowvalue.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index 239fb25b89..6f66f2f44e 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -311,6 +311,16 @@ fail: return NULL; } +static gboolean +needs_blur (const GtkCssValue *shadow) +{ + double radius = _gtk_css_number_value_get (shadow->radius, 0); + if (radius == 0.0) + return FALSE; + + return TRUE; +} + static const cairo_user_data_key_t original_cr_key; static cairo_t * @@ -322,12 +332,12 @@ gtk_css_shadow_value_start_drawing (const GtkCssValue *shadow, cairo_t *blur_cr; gdouble radius, clip_radius; - radius = _gtk_css_number_value_get (shadow->radius, 0); - if (radius == 0.0) + if (!needs_blur (shadow)) return cr; gdk_cairo_get_clip_rectangle (cr, &clip_rect); + radius = _gtk_css_number_value_get (shadow->radius, 0); clip_radius = _gtk_cairo_blur_compute_pixels (radius); /* Create a larger surface to center the blur. */ @@ -358,14 +368,14 @@ gtk_css_shadow_value_finish_drawing (const GtkCssValue *shadow, cairo_t *original_cr; cairo_surface_t *surface; - radius = _gtk_css_number_value_get (shadow->radius, 0); - if (radius == 0.0) + if (!needs_blur (shadow)) return cr; - surface = cairo_get_target (cr); original_cr = cairo_get_user_data (cr, &original_cr_key); /* Blur the surface. */ + surface = cairo_get_target (cr); + radius = _gtk_css_number_value_get (shadow->radius, 0); _gtk_cairo_blur_surface (surface, radius); gdk_cairo_set_source_rgba (original_cr, _gtk_css_rgba_value_get_rgba (shadow->color)); @@ -573,7 +583,7 @@ _gtk_css_shadow_value_paint_box (const GtkCssValue *shadow, clip_box = *padding_box; _gtk_rounded_box_shrink (&clip_box, -clip_radius, -clip_radius, -clip_radius, -clip_radius); - if (radius == 0) + if (!needs_blur (shadow)) draw_shadow (shadow, cr, &box, &clip_box, FALSE); else { |