2008-08-01 Claudio Saavedra <csaavedra@igalia.com>

* src/hildon-touch-selector.c: (hildon_touch_selector_init),
	(hildon_touch_selector_append_column): Make the widget a GtkVBox
	derived class to ease placement of an entry widget in
	HildonTouchSelectorEntry. Added a private GtkHBox, packed
	at the end, where the selector columns are packed now.

diff --git a/ChangeLog b/ChangeLog
index 3699eac..d0c3124 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-08-01  Claudio Saavedra  <csaavedra@igalia.com>
 
+       * src/hildon-touch-selector.c: (hildon_touch_selector_init),
+       (hildon_touch_selector_append_column): Make the widget a GtkVBox
+       derived class to ease placement of an entry widget in
+       HildonTouchSelectorEntry. Added a private GtkHBox, packed at the
+       end, where the selector columns are packed now.
+
+2008-08-01  Claudio Saavedra  <csaavedra@igalia.com>
+
        * src/hildon-picker-button.c: Removed the simple _text() API.
        * src/hildon-picker-button.h: Likewise.
 

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index 844e3d3..844df85 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -39,14 +39,14 @@
 #define HILDON_TOUCH_SELECTOR_GET_PRIVATE(obj)                          \
   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_TOUCH_SELECTOR, HildonTouchSelectorPrivate))
 
-G_DEFINE_TYPE (HildonTouchSelector, hildon_touch_selector, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (HildonTouchSelector, hildon_touch_selector, GTK_TYPE_VBOX)
 
 #define CENTER_ON_SELECTED_ITEM_DELAY 50
 
 /**
  * Struct to maintain the data of each column. The columns are the elements
  * of the widget that belongs properly to the selection behaviour. As
- * the selector is a hbox, you can add more widgets, like buttons etc.
+ * the selector contents are arranged in a #GtkHBox, you can add more widgets, like buttons etc.
  * between the columns, but this doesn't belongs to the selection
  * logic
  */
@@ -63,6 +63,7 @@ struct _SelectorColumn
 struct _HildonTouchSelectorPrivate
 {
   GSList *columns;              /* the selection columns */
+  GtkWidget *hbox;              /* the container for the selector's columns */
 
   HildonTouchSelectorPrintFunc print_func;
 };
@@ -151,6 +152,11 @@ hildon_touch_selector_init (HildonTouchSelector * selector)
   selector->priv->columns = NULL;
 
   selector->priv->print_func = NULL;
+  selector->priv->hbox = gtk_hbox_new (FALSE, 0);
+
+  gtk_box_pack_end (GTK_BOX (selector), selector->priv->hbox,
+                    TRUE, TRUE, 0);
+  gtk_widget_show (selector->priv->hbox);
 
   /* FIXME: this is the correct height? A fixed height is the correct 
      implementation */
@@ -540,7 +546,7 @@ hildon_touch_selector_append_column (HildonTouchSelector * selector,
 
     selector->priv->columns = g_slist_append (selector->priv->columns,
                                               new_column);
-    gtk_box_pack_start (GTK_BOX (selector), new_column->panarea, TRUE, TRUE, 6);
+    gtk_box_pack_start (GTK_BOX (selector->priv->hbox), new_column->panarea, TRUE, TRUE, 6);
 
     gtk_widget_show_all (new_column->panarea);
   } else {