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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-09-24 17:03:15 +0300 (Mon, 24 Sep 2007)
New Revision: 14045

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

	* src/hd-applications-menu.c (hd_applications_menu_init,
	hd_applications_menu_initial_setup, hd_applications_menu_show,
	hd_applications_menu_changed, hd_applications_menu_popdown): preload
	initial category on menu popdown and/or on desktop startup in order 
	to improve general performance of menu popup action. Reduced delay for
	loading menu on startup to better fit the desktop's startup time.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 14:02:21 UTC (rev 14044)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-24 14:03:15 UTC (rev 14045)
@@ -1,3 +1,12 @@
+2007-09-24  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hd-applications-menu.c (hd_applications_menu_init,
+	hd_applications_menu_initial_setup, hd_applications_menu_show,
+	hd_applications_menu_changed, hd_applications_menu_popdown): preload
+	initial category on menu popdown and/or on desktop startup in order 
+	to improve general performance of menu popup action. Reduced delay for
+	loading menu on startup to better fit the desktop's startup time.
+
 2007-09-24  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-panel-expandable.c:

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-24 14:02:21 UTC (rev 14044)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-09-24 14:03:15 UTC (rev 14045)
@@ -111,6 +111,7 @@
 };
 
 static void hd_applications_menu_register_monitors (HDApplicationsMenu *button);
+static void hd_applications_menu_initial_setup (HDApplicationsMenu *button);
 static gboolean hd_applications_menu_changed (HDApplicationsMenu *button);
 static void hd_applications_menu_create_menu (HDApplicationsMenu *button);
 static void hd_applications_menu_button_toggled (GtkWidget *widget, HDApplicationsMenu *button);
@@ -217,7 +218,7 @@
   hd_applications_menu_register_monitors (button);
 
   priv->menu_update_timeout =
-      g_timeout_add (8000, (GSourceFunc) hd_applications_menu_changed, button);
+      g_timeout_add (5500, (GSourceFunc) hd_applications_menu_changed, button);
 }
 
 GtkWidget *
@@ -255,6 +256,8 @@
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button->priv->button),
 			        FALSE);
+
+  hd_applications_menu_initial_setup (button);
 }
 
 static gboolean
@@ -365,7 +368,7 @@
       return gtk_widget_event (GTK_WIDGET (button->priv->menu_applications), (GdkEvent *) event);
     }
   }
-  
+ 
   return FALSE;
 }
 
@@ -1115,21 +1118,13 @@
 }
 
 static void
-hd_applications_menu_show (HDApplicationsMenu * button)
+hd_applications_menu_initial_setup (HDApplicationsMenu *button)
 {
   GList *menu_items;
   
   g_return_if_fail (button);
   
-  if (!button->priv->popup_window)
-    hd_applications_menu_create_menu (button);
-
   button->priv->motion_reset = TRUE;
-  
-  hildon_desktop_popup_window_popup (button->priv->popup_window,
-		                     (HDPopupWindowPositionFunc) hd_applications_menu_get_menu_position,
-		                     button,
-		                     GDK_CURRENT_TIME);
 
   hildon_desktop_popup_menu_select_first_item (button->priv->menu_categories);
   hildon_desktop_popup_menu_scroll_to_selected (button->priv->menu_categories);
@@ -1144,6 +1139,23 @@
 
   g_list_free (menu_items);
 }
+	
+static void
+hd_applications_menu_show (HDApplicationsMenu *button)
+{
+  g_return_if_fail (button);
+  
+  if (!button->priv->popup_window)
+  {
+    hd_applications_menu_create_menu (button);
+    hd_applications_menu_initial_setup (button);
+  }
+    
+  hildon_desktop_popup_window_popup (button->priv->popup_window,
+		                     (HDPopupWindowPositionFunc) hd_applications_menu_get_menu_position,
+		                     button,
+		                     GDK_CURRENT_TIME);
+}
 
 static void
 hd_applications_menu_button_toggled (GtkWidget *widget, HDApplicationsMenu *button)
@@ -1231,15 +1243,17 @@
   
   hd_applications_menu_create_menu (button);
   
+  hd_applications_menu_initial_setup (button);
+
   return FALSE;
 }
 
 static void
 hd_applications_menu_dir_changed (GnomeVFSMonitorHandle *handle,
-                              const gchar *monitor_uri,
-                              const gchar *info_uri,
-                              GnomeVFSMonitorEventType event_type,
-                              HDApplicationsMenu *button)
+                                  const gchar *monitor_uri,
+                                  const gchar *info_uri,
+                                  GnomeVFSMonitorEventType event_type,
+                                  HDApplicationsMenu *button)
 {
   if (!button->priv->monitor_update_timeout)
   {

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-24 14:02:21 UTC (rev 14044)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-09-24 14:03:15 UTC (rev 14045)
@@ -865,8 +865,6 @@
 
   system_inactivity = (state == OSSO_DISPLAY_OFF); 
 
-  g_debug ("LALALALALALALALA: %d", system_inactivity);
-  
   if (system_inactivity != priv->system_inactivity)
   {
     priv->system_inactivity = system_inactivity;