[maemo-commits] [maemo-commits] r9162 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-01-17 12:19:34 +0200 (Wed, 17 Jan 2007)
New Revision: 9162

Modified:
   projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c
   projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c
Log:

	* src/hn-app-switcher.c: Fixed showing arrows of main menu when no
        applications.
        * src/hn-others-button.c: Fixed keyboard navigation.
	* ChangeLog updated.



Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-17 10:03:02 UTC (rev 9161)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog	2007-01-17 10:19:34 UTC (rev 9162)
@@ -1,3 +1,9 @@
+2007-01-17  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hn-app-switcher.c: Fixed showing arrows of main menu when no 
+	applications.
+	* src/hn-others-button.c: Fixed keyboard navigation.
+
 2007-01-17  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-config.h, src/hd-desktop.c: use simpler TOP, BOTTOM, LEFT and RIGHT for

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c	2007-01-17 10:03:02 UTC (rev 9161)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c	2007-01-17 10:19:34 UTC (rev 9162)
@@ -613,7 +613,7 @@
     *x += widget->allocation.width;
 
   gtk_widget_size_request ((HN_APP_SWITCHER (widget)->priv->main_menu), &req);
-  *y = (*y + widget->allocation.y) + req.height;
+  *y = (*y + widget->allocation.y);/*FIXME: + req.height;*/
 
   *push_in = FALSE;
 }
@@ -951,6 +951,8 @@
 
   gtk_widget_show_all (GTK_WIDGET (app_switcher->box));
 
+  queue_refresh_buttons (app_switcher);
+
   g_list_free (children);
 }
 
@@ -1004,8 +1006,6 @@
 
   g_object_ref (app_switcher->hdwm);
 
-  g_debug ("singleton wm: %p",app_switcher->hdwm);
-
   if (!app_switcher->priv->home_info)
     app_switcher->priv->home_info = hd_entry_info_new (HD_ENTRY_DESKTOP);
 
@@ -1151,8 +1151,10 @@
   /* show the main menu button only if there is at least
    * one application on the switcher
    */
-  if (hd_wm_get_applications (HN_APP_SWITCHER (widget)->hdwm))
+  if (hd_wm_get_applications (HN_APP_SWITCHER (widget)->hdwm) != NULL)
     gtk_widget_show (priv->main_button);
+  else
+    gtk_widget_hide (GTK_BIN (priv->main_button)->child);
 
   /* show only the buttons linked to an application */
   for (i = 0; i < priv->nitems; i++)

Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c	2007-01-17 10:03:02 UTC (rev 9161)
+++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c	2007-01-17 10:19:34 UTC (rev 9162)
@@ -231,8 +231,10 @@
     }
     else
     {
-      hd_wm_activate (HD_TN_ACTIVATE_KEY_FOCUS);
+      GdkWindow *window = gtk_widget_get_parent_window (button->priv->button);
+     
       gtk_widget_grab_focus (GTK_WIDGET (button->priv->button));
+      hd_wm_activate_window (HD_TN_ACTIVATE_KEY_FOCUS,window);
     }
     
     return TRUE;