diff options
author | Ray Strode <rstrode@redhat.com> | 2008-03-05 16:44:59 +0000 |
---|---|---|
committer | Ray Strode <halfline@src.gnome.org> | 2008-03-05 16:44:59 +0000 |
commit | 318b7777a0a513dc206c22065e2354c5aaa472c6 (patch) | |
tree | c8b201fe91f1b88cc246dedadd708bc06a338661 | |
parent | e51db50f3b3c9bd256b46bf1e52d185d0dd812c9 (diff) | |
download | gdm-318b7777a0a513dc206c22065e2354c5aaa472c6.tar.gz |
Draw selected timers with the right colors when they aren't focused
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
svn path=/trunk/; revision=5931
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-cell-renderer-timer.c | 13 |
2 files changed, 17 insertions, 3 deletions
@@ -1,5 +1,12 @@ 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 + +2008-03-05 Ray Strode <rstrode@redhat.com> + * gui/simple-greeter/Makefile.am: Link common convenience lib to test binary, to prevent build failure diff --git a/gui/simple-greeter/gdm-cell-renderer-timer.c b/gui/simple-greeter/gdm-cell-renderer-timer.c index fbd31b7b..1384e227 100644 --- a/gui/simple-greeter/gdm-cell-renderer-timer.c +++ b/gui/simple-greeter/gdm-cell-renderer-timer.c @@ -181,10 +181,17 @@ gdm_cell_renderer_timer_render (GtkCellRenderer *cell, 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, |