[gtk+/wip/pango-shadow-cache: 68/69] cssshadowvalue: Move the check for blurring into its own function
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/pango-shadow-cache: 68/69] cssshadowvalue: Move the check for blurring into its own function
- Date: Wed, 3 Sep 2014 16:11:34 +0000 (UTC)
commit cbfdbc94ad0cb8f2eca96319e6cc038bce714286
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Aug 29 14:48:29 2014 -0700
cssshadowvalue: Move the check for blurring into its own function
This makes it easier to update the check later.
gtk/gtkcssshadowvalue.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c
index 239fb25..6f66f2f 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
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]