[Galago-commits] r2947 - in trunk/notification-daemon: . src/themes/standard

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-11-09 16:50:22 -0800 (Thu, 09 Nov 2006)
New Revision: 2947

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/themes/standard/theme.c
Log:
Split the background filling and stripe painting out of draw_border(). Put the calls into paint_window() and connect that to the expose event.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-11-10 00:43:37 UTC (rev 2946)
+++ trunk/notification-daemon/ChangeLog	2006-11-10 00:50:22 UTC (rev 2947)
@@ -1,3 +1,10 @@
+Thu Nov 09 16:49:39 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/themes/standard/theme.c:
+	  - Split the background filling and stripe painting out of draw_border().
+	    Put the calls into paint_window() and connect that to the expose
+	    event.
+
 Thu Nov 09 16:42:58 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/themes/standard/theme.c:

Modified: trunk/notification-daemon/src/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/src/themes/standard/theme.c	2006-11-10 00:43:37 UTC (rev 2946)
+++ trunk/notification-daemon/src/themes/standard/theme.c	2006-11-10 00:50:22 UTC (rev 2947)
@@ -330,13 +330,10 @@
 	}
 }
 
-static gboolean
+static void
 draw_border(GtkWidget *win,
-			GdkEventExpose *event,
 			WindowData *windata)
 {
-	fill_background(win, windata);
-
 	if (windata->gc == NULL)
 	{
 		GdkColor color;
@@ -363,6 +360,15 @@
 						   0, 0, windata->width - 1, windata->height - 1);
 	}
 
+}
+
+static gboolean
+paint_window(GtkWidget *win,
+			 GdkEventExpose *event,
+			 WindowData *windata)
+{
+	fill_background(win, windata);
+	draw_border(win, windata);
 	draw_stripe(win, windata);
 
 	return FALSE;
@@ -440,7 +446,7 @@
 	atk_object_set_role(gtk_widget_get_accessible(win), ATK_ROLE_ALERT);
 
 	g_signal_connect(G_OBJECT(win), "expose_event",
-					 G_CALLBACK(draw_border), windata);
+					 G_CALLBACK(paint_window), windata);
 	g_signal_connect(G_OBJECT(win), "configure_event",
 					 G_CALLBACK(configure_event_cb), windata);