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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-22 12:50:56 +0300 (Wed, 22 Aug 2007)
New Revision: 13331

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

	* libhildondesktop/hildon-desktop-popup-menu.c
	(hildon_desktop_popup_menu_parent_size,
	hildon_desktop_popup_menu_size_allocate): fix strange resizing of menu
	items when adding/removing items from the menu.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-22 09:25:10 UTC (rev 13330)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-22 09:50:56 UTC (rev 13331)
@@ -1,5 +1,12 @@
 2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* libhildondesktop/hildon-desktop-popup-menu.c
+	(hildon_desktop_popup_menu_parent_size,
+	hildon_desktop_popup_menu_size_allocate): fix strange resizing of menu
+	items when adding/removing items from the menu.
+
+2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-desktop-panel-expandable.c
 	(hildon_desktop_panel_expandable_hide_on_delete,
 	hildon_desktop_panel_expandable_constructor): set panel extension

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 09:25:10 UTC (rev 13330)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-08-22 09:50:56 UTC (rev 13331)
@@ -337,8 +337,6 @@
 
       gtk_widget_size_allocate (child, &child_allocation);
 
-      gtk_widget_queue_draw (GTK_WIDGET (child));
-
       height += child_requisition.height;
     }
   }
@@ -769,10 +767,12 @@
 		  "border-width", &border_width,
 		  NULL); 
     
-    gtk_widget_size_request (menu->priv->parent, &req);
+    gtk_widget_set_size_request (menu->priv->box_items, 
+		                 parent_req.width - 8, 
+				 -1);
 
     gtk_widget_set_size_request (menu->priv->parent,
-		    		 req.width,
+		    		 parent_req.width,
 				 show_scroll_controls ? 
 				 max_height : 
 				 d_height + (2 * border_width));
@@ -787,7 +787,7 @@
     
     if (GTK_WIDGET_REALIZED (menu->priv->parent))
       gdk_window_resize (menu->priv->parent->window,
-		         req.width,
+		         parent_req.width,
 			 show_scroll_controls ? 
 			 max_height : 
 	                 d_height + (2 * border_width));