2009-04-14 Alberto Garcia <agarcia@igalia.com>

* src/hildon-button.c (hildon_button_set_arrangement):
	Due to NB#88126, if one of the labels is too long it will be
	painted outside the button. The 'value' label is more likely to be
	the longest one, so we change its packing options in order to
	truncate it if necessary. As a side effect, the 'title' label will
	no longer be truncated.

	Fixes: NB#110689 (HildonPickerButton doesn't ellipsize very long values)

diff --git a/ChangeLog b/ChangeLog
index 113a27e..a72e15e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-14  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-button.c (hildon_button_set_arrangement):
+       Due to NB#88126, if one of the labels is too long it will be
+       painted outside the button. The 'value' label is more likely to be
+       the longest one, so we change its packing options in order to
+       truncate it if necessary. As a side effect, the 'title' label will
+       no longer be truncated.
+
+       Fixes: NB#110689 (HildonPickerButton doesn't ellipsize very long values)
+
 2009-04-14  Claudio Saavedra  <csaavedra@igalia.com>
 
        [Release 2.1.64]

diff --git a/src/hildon-button.c b/src/hildon-button.c
index 23ee096..7123152 100644 (file)
--- a/src/hildon-button.c
+++ b/src/hildon-button.c
@@ -518,9 +518,9 @@ hildon_button_set_arrangement                   (HildonButton            *button
 
     /* If we pack both labels with (TRUE, TRUE) or (FALSE, FALSE) they
      * can be painted outside of the button in some situations, see
-     * NB#88126 */
-    gtk_box_pack_start (GTK_BOX (priv->label_box), GTK_WIDGET (priv->title), TRUE, TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (priv->label_box), GTK_WIDGET (priv->value), FALSE, FALSE, 0);
+     * NB#88126 and NB#110689 */
+    gtk_box_pack_start (GTK_BOX (priv->label_box), GTK_WIDGET (priv->title), FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (priv->label_box), GTK_WIDGET (priv->value), TRUE, TRUE, 0);
 
     hildon_button_construct_child (button);
 }