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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-16 11:41:52 +0300 (Thu, 16 Aug 2007)
New Revision: 13225

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

	* src/hd-switcher-menu.c (hd_switcher_menu_check_content,
	hd_switcher_menu_constructor): correctly set notification extra 
	pane height in order to avoid having an empty pane flicking besides
	application pane.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-16 07:39:32 UTC (rev 13224)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-16 08:41:52 UTC (rev 13225)
@@ -1,3 +1,10 @@
+2007-08-16  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-switcher-menu.c (hd_switcher_menu_check_content,
+	hd_switcher_menu_constructor): correctly set notification extra 
+	pane height in order to avoid having an empty pane flicking besides
+	application pane.
+
 2007-08-15  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-switcher-menu.c (hd_switcher_menu_scroll_to): fix crasher

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-16 07:39:32 UTC (rev 13224)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-16 08:41:52 UTC (rev 13225)
@@ -85,6 +85,7 @@
 /* Hardcoded pixel perfecting values */
 #define AS_BUTTON_BORDER_WIDTH  0
 #define AS_MENU_BORDER_WIDTH    20
+#define AS_MENU_PANE_WIDTH      340
 #define AS_TIP_BORDER_WIDTH 	20
 #define AS_BUTTON_HEIGHT        38
 #define AS_MENU_BUTTON_HEIGHT   116
@@ -856,10 +857,10 @@
 		NULL);
   
   gtk_widget_set_size_request (GTK_WIDGET (switcher->priv->popup_window),
-			       340, 100);
+			       AS_MENU_PANE_WIDTH, 100);
   
   gtk_widget_set_size_request (GTK_WIDGET (switcher->priv->notifications_window),
-			       340, 100);  
+			       AS_MENU_PANE_WIDTH, 1);  
 
   switcher->priv->menu_applications =
     HILDON_DESKTOP_POPUP_MENU (g_object_new (HILDON_DESKTOP_TYPE_POPUP_MENU,
@@ -1341,11 +1342,17 @@
         else
           hd_switcher_menu_attach_button (switcher);	     
       }	       
-	     
+
       hd_switcher_menu_update_highlighting (switcher, TRUE);
     }
     else
-    {	     
+    {
+      gtk_widget_hide (switcher->priv->notifications_window);
+
+      /* Avoid notification pane to be shown next time switcher
+       * menu opens. */
+      switcher->priv->notifications_window->requisition.height = 1;
+ 
       hd_switcher_menu_update_highlighting (switcher, FALSE); 
     }