2009-04-07 Alejandro Pinheiro <apinheiro@igalia.com>

* src/hildon-picker-dialog.c
	* src/hildon-touch-selector.c
	Reverting the change that tried to avoid the hardcoded height on
	the picker dialog, as causes problems on the hildon-touch-selector
	initial-hint

	Fixes NB#110029 (selectors not scrolling to selected value)

diff --git a/ChangeLog b/ChangeLog
index b97ee40..b91463f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-04-07  Alejandro Pinheiro <apinheiro@igalia.com>
+
+       * src/hildon-picker-dialog.c
+       * src/hildon-touch-selector.c
+       Reverting the change that tried to avoid the hardcoded height on
+       the picker dialog, as causes problems on the hildon-touch-selector
+       initial-hint
+
+       Fixes NB#110029 (selectors not scrolling to selected value)
+
 2009-04-07  Alberto Garcia  <agarcia@igalia.com>
 
        * src/hildon-touch-selector.c: Fix typos

diff --git a/src/hildon-picker-dialog.c b/src/hildon-picker-dialog.c
index c5b9217..3fa11b3 100644 (file)
--- a/src/hildon-picker-dialog.c
+++ b/src/hildon-picker-dialog.c
@@ -54,6 +54,8 @@
 
 G_DEFINE_TYPE (HildonPickerDialog, hildon_picker_dialog, HILDON_TYPE_DIALOG)
 
+#define HILDON_TOUCH_SELECTOR_HEIGHT            320
+
 struct _HildonPickerDialogPrivate
 {
   GtkWidget *selector;
@@ -583,6 +585,10 @@ _hildon_picker_dialog_set_selector (HildonPickerDialog * dialog,
 
   g_object_unref (selector);
 
+  /* Ensure that the dialog's height is correct */
+  gtk_widget_set_size_request (GTK_WIDGET (dialog->priv->selector), -1,
+                               HILDON_TOUCH_SELECTOR_HEIGHT);
+
   gtk_widget_show (dialog->priv->selector);
 
   prepare_action_area (dialog);

diff --git a/src/hildon-touch-selector.c b/src/hildon-touch-selector.c
index dc6cdf6..ae7d70b 100644 (file)
--- a/src/hildon-touch-selector.c
+++ b/src/hildon-touch-selector.c
@@ -692,9 +692,6 @@ _create_new_column (HildonTouchSelector * selector,
   g_object_set (G_OBJECT (panarea),
                 "initial-hint", FALSE, NULL);
 
-  hildon_pannable_area_set_size_request_policy (HILDON_PANNABLE_AREA (panarea),
-                                                HILDON_SIZE_REQUEST_CHILDREN);
-
   gtk_container_add (GTK_CONTAINER (panarea), GTK_WIDGET (tv));
 
   new_column->priv->model = model;