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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-22 19:45:48 +0300 (Wed, 22 Aug 2007)
New Revision: 13364

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-applications-menu.c, src/hd-switcher-menu.c: do not
	explicitly set separator's size request and take it from style.
	* libhildondesktop/hildon-desktop-popup-menu.c
	(hildon_desktop_popup_menu_add_item): add menu item before querying
	size requests in order to correctly get style from theme.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-22 16:40:59 UTC (rev 13363)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-22 16:45:48 UTC (rev 13364)
@@ -1,5 +1,13 @@
 2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-applications-menu.c, src/hd-switcher-menu.c: do not
+	explicitly set separator's size request and take it from style.
+	* libhildondesktop/hildon-desktop-popup-menu.c
+	(hildon_desktop_popup_menu_add_item): add menu item before querying
+	size requests in order to correctly get style from theme.
+
+2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c: fix sizing of internal
 	items box for all parenting cases.
 

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-08-22 16:40:59 UTC (rev 13363)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-08-22 16:45:48 UTC (rev 13364)
@@ -558,9 +558,6 @@
       gtk_adjustment_set_value (adj, position + (gdouble) delta); 
     else
       gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
-
-    /* NOTE: Don't remove this 
-    g_debug ("min: %lf max: %lf current: %lf", adj->lower,adj->upper, adj->value);*/
   }
 }
 
@@ -901,11 +898,16 @@
       item_width = req.width;
   }
   
+  gtk_box_pack_end (GTK_BOX (menu->priv->box_items),
+		    GTK_WIDGET (item),
+		    FALSE, FALSE, 0);
+
   if (GTK_IS_SEPARATOR_MENU_ITEM (item))
   {
     GtkRequisition req_sep;
 
     gtk_widget_size_request (GTK_WIDGET (item), &req_sep);
+
     gtk_widget_set_size_request (GTK_WIDGET (item), item_width, req_sep.height);
   }
   else
@@ -913,10 +915,6 @@
     gtk_widget_set_size_request (GTK_WIDGET (item), item_width, menu->priv->item_height);
   }
   
-  gtk_box_pack_end (GTK_BOX (menu->priv->box_items),
-		    GTK_WIDGET (item),
-		    FALSE, FALSE, 0);
-
   gtk_widget_show (GTK_WIDGET (item));
 
   gtk_widget_set_size_request (menu->priv->box_buttons, 

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-08-22 16:40:59 UTC (rev 13363)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-08-22 16:45:48 UTC (rev 13364)
@@ -665,6 +665,8 @@
     }
     else if (g_str_equal (item_desktop_id, SEPARATOR_STRING))
     {
+	GtkRequisition req;
+	    
       /* Separator */
       menu_item = gtk_separator_menu_item_new ();
 
@@ -673,7 +675,7 @@
       else
         gtk_widget_set_name (GTK_WIDGET (menu_item), HD_APPS_MENU_CAT_MENU_ITEM_NAME);
  
-      gtk_widget_set_size_request (GTK_WIDGET (menu_item), -1, 1);
+      gtk_widget_size_request (GTK_WIDGET (menu_item), &req);
     }
     else if (level > 0)
     {
@@ -756,9 +758,7 @@
       if (!first_item)
       {
         GtkWidget *separator = gtk_separator_menu_item_new ();
-
-	gtk_widget_set_size_request (GTK_WIDGET (separator), -1, 1);
-
+	
         if (level > 0)
           gtk_widget_set_name (GTK_WIDGET (separator), HD_APPS_MENU_APP_MENU_ITEM_NAME);
         else

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-22 16:40:59 UTC (rev 13363)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-22 16:45:48 UTC (rev 13364)
@@ -284,8 +284,6 @@
 
   separator = gtk_separator_menu_item_new ();
 
-  gtk_widget_set_size_request (separator, -1, 1);
-
   if (is_application_menu)
     gtk_widget_set_name (separator, HD_SWITCHER_MENU_APP_MENU_ITEM_NAME);
   else