gdm r5931 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Wed Mar  5 16:44:59 2008
New Revision: 5931
URL: http://svn.gnome.org/viewvc/gdm?rev=5931&view=rev

Log:
2008-03-05  Ray Strode <rstrode redhat com>

	* gui/simple-greeter/gdm-cell-renderer-timer.c
	(gdm_cell_renderer_timer_render):
	Draw selected timers with the right colors when they
	aren't focused


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-cell-renderer-timer.c

Modified: trunk/gui/simple-greeter/gdm-cell-renderer-timer.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-cell-renderer-timer.c	(original)
+++ trunk/gui/simple-greeter/gdm-cell-renderer-timer.c	Wed Mar  5 16:44:59 2008
@@ -181,10 +181,17 @@
                          cell_area->x + cell->xpad,
                          cell_area->y + cell->ypad);
 
+        widget_state = GTK_STATE_NORMAL;
         if (renderer_state & GTK_CELL_RENDERER_SELECTED) {
-                widget_state = GTK_STATE_SELECTED;
-        } else {
-                widget_state = GTK_STATE_NORMAL;
+                if (GTK_WIDGET_HAS_FOCUS (widget)) {
+                        widget_state = GTK_STATE_SELECTED;
+                } else {
+                        widget_state = GTK_STATE_ACTIVE;
+                }
+        }
+
+        if (renderer_state & GTK_CELL_RENDERER_INSENSITIVE) {
+                widget_state = GTK_STATE_INSENSITIVE;
         }
 
         draw_timer (renderer, context,