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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-24 12:57:45 +0300 (Fri, 24 Aug 2007)
New Revision: 13390

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
Log:
2007-08-24  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-desktop-popup-menu.c: fix theming on the
	arrows by setting the correct height for the scroll buttons box.
	* src/hd-applications-menu.c: do not re-activate categories when they
	are already selected.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-24 09:06:26 UTC (rev 13389)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-24 09:57:45 UTC (rev 13390)
@@ -1,3 +1,10 @@
+2007-08-24  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* libhildondesktop/hildon-desktop-popup-menu.c: fix theming on the
+	arrows by setting the correct height for the scroll buttons box.
+	* src/hd-applications-menu.c: do not re-activate categories when they
+	are already selected.
+
 2007-08-22  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-applications-menu.c, src/hd-switcher-menu.c: do not

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-24 09:06:26 UTC (rev 13389)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-08-24 09:57:45 UTC (rev 13390)
@@ -919,7 +919,7 @@
 
   gtk_widget_set_size_request (menu->priv->box_buttons, 
 		  	       item_width, 
-			       menu->priv->item_height);
+			       menu->priv->item_height + 2);
 
   menu->priv->n_items++;
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-08-24 09:06:26 UTC (rev 13389)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-08-24 09:57:45 UTC (rev 13390)
@@ -354,32 +354,39 @@
 static void
 hd_applications_menu_activate_category (GtkMenuItem *item, HDApplicationsMenu *button)
 {
+  static GtkMenuItem *last_selected_item = NULL;
+
   GList *sub_items, *i;
-
+  
   sub_items = hildon_desktop_popup_menu_get_children 
 	  (button->priv->menu_applications);
   
-  for (i = g_list_first (sub_items); i; i = i->next)
+  if (last_selected_item != item)
   {
-    GtkMenuItem *child = (GtkMenuItem *) i->data;
+    last_selected_item = item;
+	  
+    for (i = g_list_first (sub_items); i; i = i->next)
+    {
+      GtkMenuItem *child = (GtkMenuItem *) i->data;
 
-    g_object_ref (child);
+      g_object_ref (child);
 
-    hildon_desktop_popup_menu_remove_item
-      (button->priv->menu_applications, child);
-  }
+      hildon_desktop_popup_menu_remove_item
+        (button->priv->menu_applications, child);
+    }
 
-  g_list_free (sub_items);
+    g_list_free (sub_items);
 
-  sub_items = (GList *) g_object_get_data (G_OBJECT (item),
-		                           CATEGORY_SUB_ITEMS);
+    sub_items = (GList *) g_object_get_data (G_OBJECT (item),
+          	                           CATEGORY_SUB_ITEMS);
 
-  for (i = g_list_first (sub_items); i; i = i->next)
-  {
-    GtkMenuItem *child = (GtkMenuItem *) i->data;
+    for (i = g_list_first (sub_items); i; i = i->next)
+    {
+      GtkMenuItem *child = (GtkMenuItem *) i->data;
 
-    hildon_desktop_popup_menu_add_item
-      (button->priv->menu_applications, child);
+      hildon_desktop_popup_menu_add_item
+        (button->priv->menu_applications, child);
+    }
   }
 
   if (button->priv->focus_applications &&