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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-24 17:26:40 +0300 (Thu, 24 May 2007)
New Revision: 11817

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-05-24  Moises Martinez  <moises.martinez at nokia.com>

        * src/hd-switcher-menu.c: Fixed "switcher area highlighted when tapped
        on it with no applications opened". Fixes: NB#58320
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-24 14:09:29 UTC (rev 11816)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-24 14:26:40 UTC (rev 11817)
@@ -1,3 +1,8 @@
+2007-05-24  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hd-switcher-menu.c: Fixed "switcher area highlighted when tapped
+	on it with no applications opened". Fixes: NB#58320
+
 2007-05-23  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hd-switcher-menu.c: Fixed behavior I just introduced.

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-05-24 14:09:29 UTC (rev 11816)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-05-24 14:26:40 UTC (rev 11817)
@@ -290,8 +290,8 @@
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (switcher->priv->toggle_button), FALSE);
 
-      GdkWindow *window = gtk_widget_get_parent_window (GTK_WIDGET (switcher));
-      gtk_widget_grab_focus (GTK_WIDGET (switcher));
+      GdkWindow *window = gtk_widget_get_parent_window (switcher->priv->toggle_button);
+      gtk_widget_grab_focus (GTK_WIDGET (switcher->priv->toggle_button));
       hd_wm_activate_window (HD_TN_ACTIVATE_KEY_FOCUS,window);
     }
 
@@ -786,9 +786,13 @@
   apps = hd_wm_get_applications (switcher->hdwm);
   
   if (apps || children)
-  {
+  {    
+    g_object_set (switcher->priv->toggle_button, "can-focus", TRUE, NULL);
+    gtk_widget_grab_focus (switcher->priv->toggle_button);
+    gtk_widget_set_sensitive (switcher->priv->toggle_button, TRUE);
+
     gtk_widget_show (GTK_BIN (switcher->priv->toggle_button)->child);
-     
+
     if (children)
     {	     
       if (GTK_BIN (switcher->priv->toggle_button)->child != switcher->priv->icon)
@@ -822,7 +826,9 @@
      hd_switcher_menu_update_highlighting (switcher, FALSE);
 	  
      gtk_widget_hide (GTK_BIN (switcher->priv->toggle_button)->child);	  
-
+     g_object_set (switcher->priv->toggle_button, "can-focus", FALSE, NULL);
+     gtk_widget_set_sensitive (switcher->priv->toggle_button, FALSE);
+     
      if (switcher->priv->is_open)
        hildon_desktop_popup_window_popdown 
          (switcher->priv->popup_window);