[maemo-commits] [maemo-commits] r14066 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-25 13:57:33 +0300 (Tue, 25 Sep 2007)
New Revision: 14066

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
Log:
2007-09-25  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-switcher-menu-item.c (hd_switcher_menu_item_constructor):
	make sure the menu items are correctly ellipsized. Fixes: NB#70588.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-25 10:48:01 UTC (rev 14065)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-25 10:57:33 UTC (rev 14066)
@@ -1,3 +1,8 @@
+2007-09-25  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-switcher-menu-item.c (hd_switcher_menu_item_constructor):
+	make sure the menu items are correctly ellipsized. Fixes: NB#70588.
+
 2007-09-24  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-switcher-menu.c: (hd_switcher_menu_changed_info_cb),

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-09-25 10:48:01 UTC (rev 14065)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu-item.c	2007-09-25 10:57:33 UTC (rev 14066)
@@ -348,6 +348,7 @@
                                    GTK_RC_FG,
                                    GTK_STATE_NORMAL,
                                    AS_SECONDARY_TEXT_COLOR);
+  gtk_label_set_ellipsize (GTK_LABEL (priv->label2), PANGO_ELLIPSIZE_END);
   gtk_widget_set_composite_name (GTK_WIDGET (priv->label2), "as-app-menu-label-desc");
   gtk_misc_set_alignment (GTK_MISC (priv->label2), 0.0, 0.1);
   gtk_box_pack_end (GTK_BOX (vbox), priv->label2, TRUE, TRUE, 0);
@@ -358,6 +359,7 @@
                                    GTK_RC_FG,
                                    GTK_STATE_NORMAL,
                                    AS_TEXT_COLOR);
+  gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END);
   gtk_widget_set_composite_name (GTK_WIDGET (priv->label), "as-app-menu-label");
   gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.9);
   gtk_box_pack_end (GTK_BOX (vbox), priv->label, TRUE, TRUE, 0);
@@ -554,9 +556,6 @@
   if (child_width > label_width_ellipsize)
   {
     requisition->width = label_width_ellipsize;
-
-    gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END);
-    gtk_label_set_ellipsize (GTK_LABEL (priv->label2), PANGO_ELLIPSIZE_END);
   }
   else
     requisition->width = MAX (requisition->width, child_width);