2008-11-18 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-color-chooser-dialog.c: Use theme colors for the selected
	color frame and some minor tweaks to make it more consistent with
	current theming.

	Fixes: NB#91769 (HildonColorChooserDialog's selected colour is
	highlighted but not visible)

diff --git a/ChangeLog b/ChangeLog
index f72bef6..05968a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-18  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * src/hildon-color-chooser-dialog.c: Use theme colors for the selected
+       color frame and some minor tweaks to make it more consistent with
+       current theming.
+
+       Fixes: NB#91769 (HildonColorChooserDialog's selected colour is
+       highlighted but not visible)
+
 2008-11-14  Alejandro G. Castro         <alex@igalia.com>
 
        * examples/Makefile.am: Fixed typo in the Makefile.am.

diff --git a/src/hildon-color-chooser-dialog.c b/src/hildon-color-chooser-dialog.c
index 191aa58..7dac3ef 100644 (file)
--- a/src/hildon-color-chooser-dialog.c
+++ b/src/hildon-color-chooser-dialog.c
@@ -884,7 +884,7 @@ hildon_color_chooser_dialog_area_expose         (GtkWidget *widget,
         y = ((i / w) * (tot_h + spacing));
 
         gdk_draw_rectangle (widget->window,
-                widget->style->black_gc,
+                (i == num_selected) ? widget->style->bg_gc[GTK_STATE_SELECTED] : widget->style->bg_gc[GTK_STATE_NORMAL],
                 TRUE,
                 (i == num_selected) ? x : x + 2,  
                 (i == num_selected) ? y : y + 2,
@@ -892,7 +892,7 @@ hildon_color_chooser_dialog_area_expose         (GtkWidget *widget,
                 (i == num_selected) ? tot_h : tot_h - 4);
 
         gdk_draw_rectangle(widget->window,
-                widget->style->white_gc,
+                (i == num_selected) ? widget->style->bg_gc[GTK_STATE_NORMAL] : widget->style->white_gc,
                 TRUE,
                 x + 3,  
                 y + 3,