[gnome-games] aisleriot: Simplify code
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] aisleriot: Simplify code
- Date: Sun, 15 Aug 2010 21:17:22 +0000 (UTC)
commit 67ee7a1bec36687ed27421b225492d596752edcb
Author: Christian Persch <chpe gnome org>
Date: Sun Aug 15 22:47:57 2010 +0200
aisleriot: Simplify code
Just use gdk_cairo_region() here.
aisleriot/board-noclutter.c | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/aisleriot/board-noclutter.c b/aisleriot/board-noclutter.c
index 6482d89..0964f9f 100644
--- a/aisleriot/board-noclutter.c
+++ b/aisleriot/board-noclutter.c
@@ -3171,8 +3171,6 @@ aisleriot_board_expose_event (GtkWidget *widget,
cairo_region_t *region = event->region;
#else
GdkRegion *region = event->region;
- GdkRectangle *rects;
- GdkRectangle *rect;
#endif
int i, n_rects;
GPtrArray *slots;
@@ -3198,16 +3196,15 @@ aisleriot_board_expose_event (GtkWidget *widget,
#if GTK_CHECK_VERSION (2, 90, 5)
if (cairo_region_is_empty (region))
return FALSE;
+
+ n_rects = cairo_region_num_rectangles (region);
#else
if (gdk_region_empty (region))
return FALSE;
-#endif
-#if GTK_CHECK_VERSION (2, 90, 5)
- n_rects = cairo_region_num_rectangles (region);
-#else
- gdk_region_get_rectangles (region, &rects, &n_rects);
+ gdk_region_get_rectangles (region, NULL, &n_rects);
#endif
+
if (n_rects == 0)
return FALSE;
@@ -3232,17 +3229,7 @@ aisleriot_board_expose_event (GtkWidget *widget,
ar_style_get_baize_color (priv->style, &color);
gdk_cairo_set_source_color (cr, &color);
-#if GTK_CHECK_VERSION (2, 90, 5)
gdk_cairo_region (cr, region);
-#else
- for (i = 0; i < n_rects; ++i) {
- rect = &rects[i];
-
- cairo_rectangle (cr, rect->x, rect->y, rect->width, rect->height);
- }
- g_free (rects);
-#endif
-
cairo_fill (cr);
/* Only draw the the cards when the geometry is set, and we're in a resize */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]