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

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-02-04 12:30:52 -0800 (Sat, 04 Feb 2006)
New Revision: 2540

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/themes/standard/theme.c
Log:
Improve the alignment and the color of the countdown.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-02-04 20:25:57 UTC (rev 2539)
+++ trunk/notification-daemon/ChangeLog	2006-02-04 20:30:52 UTC (rev 2540)
@@ -1,3 +1,8 @@
+Sat Feb 04 12:28:24 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* themes/standard/theme.c:
+	  - Improve the alignment and the color of the countdown.
+
 Sat Feb 04 12:24:32 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/themes/standard/theme.c
===================================================================
--- trunk/notification-daemon/themes/standard/theme.c	2006-02-04 20:25:57 UTC (rev 2539)
+++ trunk/notification-daemon/themes/standard/theme.c	2006-02-04 20:30:52 UTC (rev 2540)
@@ -432,7 +432,7 @@
 
 	if (windata->timeout > 0)
 	{
-		GdkGC *pie_gc = style->bg_gc[GTK_STATE_NORMAL];
+		GdkGC *pie_gc = style->bg_gc[GTK_STATE_ACTIVE];
 		gdouble pct = (gdouble)windata->remaining / (gdouble)windata->timeout;
 
 		gdk_draw_arc(GDK_DRAWABLE(windata->pie_countdown->window),
@@ -469,13 +469,19 @@
 
 	if (!GTK_WIDGET_VISIBLE(windata->actions_box))
 	{
+		GtkWidget *alignment;
+
 		gtk_widget_show(windata->actions_box);
 		update_content_hbox_visibility(windata);
 
+		alignment = gtk_alignment_new(1, 0.5, 0, 0);
+		gtk_widget_show(alignment);
+		gtk_box_pack_end(GTK_BOX(windata->actions_box), alignment,
+						   FALSE, TRUE, 0);
+
 		windata->pie_countdown = gtk_drawing_area_new();
 		gtk_widget_show(windata->pie_countdown);
-		gtk_box_pack_end(GTK_BOX(windata->actions_box), windata->pie_countdown,
-						 FALSE, FALSE, 0);
+		gtk_container_add(GTK_CONTAINER(alignment), windata->pie_countdown);
 		gtk_widget_set_size_request(windata->pie_countdown,
 									PIE_WIDTH, PIE_HEIGHT);
 		g_signal_connect(G_OBJECT(windata->pie_countdown), "expose_event",