N#8094 5-bit color selector: wrong margins and pixel measurements M#59 HildonColorSel...

diff --git a/ChangeLog b/ChangeLog
index 28eef04..21b9bef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-11  Luc Pionchon  <luc.pionchon@nokia.com>
+
+       N#8094 5-bit color selector: wrong margins and pixel measurements
+       M#59   HildonColorSelector needs more space
+       * hildon-widgets/hildon-color-popup.c (HILDON_COLOR_COL_SPACING)
+       (hildon_color_popup_new): add space between the control bars and
+       the color preview area.
+
 2006-01-03  Luc Pionchon  <luc.pionchon@nokia.com>
 
        * hildon-widgets/hildon-calendar-popup.c

diff --git a/debian/changelog b/debian/changelog
index 9a1b70a..cc8a1f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hildon-libs (0.10.1-1) unstable; urgency=low
+
+  * N#8094 5-bit color selector: wrong margins and pixel measurements
+    M#59   HildonColorSelector needs more space
+
+ -- Luc Pionchon <luc.pionchon@nokia.com>  Wed, 11 Jan 2006 20:03:33 +0200
+
 hildon-libs (0.10.0-1) unstable; urgency=low
 
   * started development branch (maintenance continues with versions 0.9.x)

diff --git a/hildon-widgets/hildon-color-popup.c b/hildon-widgets/hildon-color-popup.c
index fbecfcc..2911a62 100644 (file)
--- a/hildon-widgets/hildon-color-popup.c
+++ b/hildon-widgets/hildon-color-popup.c
@@ -53,6 +53,7 @@
 #define HILDON_COLOR_LABELS_LEFT_PAD      35
 #define HILDON_COLOR_PALETTE_POS_PAD      45
 #define HILDON_COLOR_BAR_WIDTH           449
+#define HILDON_COLOR_COL_SPACING          18
 
 /* 
  * Private function prototype definitions 
@@ -118,6 +119,7 @@ hildon_color_popup_new(GtkWindow *parent, GdkColor *initial_color,
   gtk_misc_set_alignment(GTK_MISC(l_blue), 0.08f, 0.5f);
 
   /* Add labels and control bars to the layout table */
+  gtk_table_set_col_spacing(layout, 0, HILDON_COLOR_COL_SPACING);
   gtk_table_attach_defaults(layout, l_red, 0, 1, 0, 2);
   gtk_table_attach_defaults(layout, popup_data->ctrlbar_red, 0, 1, 2, 4);
   gtk_table_attach_defaults(layout, l_green, 0, 1, 4, 6);