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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-11 18:35:07 +0300 (Fri, 11 May 2007)
New Revision: 11615

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
Log:

	* libhildondesktop/hildon-desktop-popup-menu.c:
        - Fixed problem I just introduced when resizing window parent.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-11 14:41:40 UTC (rev 11614)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-11 15:35:07 UTC (rev 11615)
@@ -1,6 +1,11 @@
 2007-05-11  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-popup-menu.c:
+	- Fixed problem I just introduced when resizing window parent.
+
+2007-05-11  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-popup-menu.c:
 	- Fixed problem with scrolling.
 	- When resizing parent with scroll controls, resize it as big as the
 	screen.

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-05-11 14:41:40 UTC (rev 11614)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-05-11 15:35:07 UTC (rev 11615)
@@ -68,8 +68,6 @@
 
   guint item_height;
 
-  gdouble upper_hack;
-
   GtkMenuItem *selected_item;
 
   gboolean     resize_parent;
@@ -358,7 +356,7 @@
     else
       gtk_adjustment_set_value (adj, upper_hack);	    
 
-    g_debug ("min: %lf max: %lf current: %lf upper_hack: %lf", adj->lower,adj->upper, adj->value, menu->priv->upper_hack);
+    g_debug ("min: %lf max: %lf current: %lf upper_hack: %lf", adj->lower,adj->upper, adj->value, upper_hack);
  }
 }	
 
@@ -544,7 +542,7 @@
 		    		 req.width,
 				 show_scroll_controls ? 
 				 screen_height : 
-				 (d_height - menu->priv->item_height));
+				 d_height);
 
     if (GTK_WIDGET_MAPPED (parent))
     {	    
@@ -559,7 +557,9 @@
 		         req.width,
 			 show_scroll_controls ? 
 			 screen_height : 
-			 (d_height - menu->priv->item_height)); 
+			 d_height);
+
+
   }
 
   g_list_free (children);