[gtk+/rendering-cleanup: 4/140] pixbuf-engine: Add Cairo version for draw_gap_image()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 4/140] pixbuf-engine: Add Cairo version for draw_gap_image()
- Date: Sun, 29 Aug 2010 16:03:48 +0000 (UTC)
commit 63c34a3a4757fe80ea315a85a6fc8158b9d424e0
Author: Benjamin Otte <otte redhat com>
Date: Tue Aug 17 04:47:02 2010 +0200
pixbuf-engine: Add Cairo version for draw_gap_image()
modules/engines/pixbuf/pixbuf-draw.c | 71 +++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 deletions(-)
---
diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index 6bff6f7..6920288 100644
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -183,8 +183,7 @@ draw_simple_image_no_cairo(GtkStyle *style,
static gboolean
draw_gap_image(GtkStyle *style,
- GdkWindow *window,
- GdkRectangle *area,
+ cairo_t *cr,
GtkWidget *widget,
ThemeMatchData *match_data,
gboolean draw_center,
@@ -198,13 +197,6 @@ draw_gap_image(GtkStyle *style,
{
ThemeImage *image;
- if ((width == -1) && (height == -1))
- gdk_drawable_get_size(window, &width, &height);
- else if (width == -1)
- gdk_drawable_get_size(window, &width, NULL);
- else if (height == -1)
- gdk_drawable_get_size(window, NULL, &height);
-
if (!(match_data->flags & THEME_MATCH_ORIENTATION))
{
match_data->flags |= THEME_MATCH_ORIENTATION;
@@ -331,20 +323,20 @@ draw_gap_image(GtkStyle *style,
}
if (image->background)
- theme_pixbuf_render_no_cairo (image->background,
- window, area, components, FALSE,
+ theme_pixbuf_render (image->background,
+ cr, components, FALSE,
x, y, width, height);
if (image->gap_start)
- theme_pixbuf_render_no_cairo (image->gap_start,
- window, area, COMPONENT_ALL, FALSE,
+ theme_pixbuf_render (image->gap_start,
+ cr, COMPONENT_ALL, FALSE,
r1.x, r1.y, r1.width, r1.height);
if (image->gap)
- theme_pixbuf_render_no_cairo (image->gap,
- window, area, COMPONENT_ALL, FALSE,
+ theme_pixbuf_render (image->gap,
+ cr, COMPONENT_ALL, FALSE,
r2.x, r2.y, r2.width, r2.height);
if (image->gap_end)
- theme_pixbuf_render_no_cairo (image->gap_end,
- window, area, COMPONENT_ALL, FALSE,
+ theme_pixbuf_render (image->gap_end,
+ cr, COMPONENT_ALL, FALSE,
r3.x, r3.y, r3.width, r3.height);
return TRUE;
@@ -353,6 +345,47 @@ draw_gap_image(GtkStyle *style,
return FALSE;
}
+static gboolean
+draw_gap_image_no_cairo(GtkStyle *style,
+ GdkWindow *window,
+ GdkRectangle *area,
+ GtkWidget *widget,
+ ThemeMatchData *match_data,
+ gboolean draw_center,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ GtkPositionType gap_side,
+ gint gap_x,
+ gint gap_width)
+{
+ gboolean result;
+ cairo_t *cr;
+
+ if ((width == -1) && (height == -1))
+ gdk_drawable_get_size(window, &width, &height);
+ else if (width == -1)
+ gdk_drawable_get_size(window, &width, NULL);
+ else if (height == -1)
+ gdk_drawable_get_size(window, NULL, &height);
+
+ cr = gdk_cairo_create (window);
+ if (area)
+ {
+ gdk_cairo_rectangle (cr, area);
+ cairo_clip (cr);
+ }
+
+ result = draw_gap_image (style, cr, widget, match_data,
+ draw_center, x, y, width, height,
+ gap_side, gap_x, gap_width);
+
+ cairo_destroy (cr);
+
+ return result;
+}
+
static void
draw_hline (GtkStyle *style,
GdkWindow *window,
@@ -801,7 +834,7 @@ draw_shadow_gap (GtkStyle *style,
match_data.shadow = shadow;
match_data.state = state;
- if (!draw_gap_image (style, window, area, widget, &match_data, FALSE,
+ if (!draw_gap_image_no_cairo (style, window, area, widget, &match_data, FALSE,
x, y, width, height, gap_side, gap_x, gap_width))
parent_class->draw_shadow_gap (style, window, state, shadow, area, widget, detail,
x, y, width, height, gap_side, gap_x, gap_width);
@@ -834,7 +867,7 @@ draw_box_gap (GtkStyle *style,
match_data.shadow = shadow;
match_data.state = state;
- if (!draw_gap_image (style, window, area, widget, &match_data, TRUE,
+ if (!draw_gap_image_no_cairo (style, window, area, widget, &match_data, TRUE,
x, y, width, height, gap_side, gap_x, gap_width))
parent_class->draw_box_gap (style, window, state, shadow, area, widget, detail,
x, y, width, height, gap_side, gap_x, gap_width);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]