gnome-panel r11186 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Mon Aug  4 02:33:25 2008
New Revision: 11186
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11186&view=rev

Log:
2008-08-04  Vincent Untz  <vuntz gnome org>

	* panel-menu-bar.c: (panel_menu_bar_hide_tooltip_and_focus): renamed
	from panel_menu_bar_hide_tooltip(), and also unfocus the focused
	child of the toplevel when opening the menu. This fixes a cosmetic
	issue.
	(panel_menu_bar_setup_tooltip): updated
	Fix bug #308632.


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel-menu-bar.c

Modified: trunk/gnome-panel/panel-menu-bar.c
==============================================================================
--- trunk/gnome-panel/panel-menu-bar.c	(original)
+++ trunk/gnome-panel/panel-menu-bar.c	Mon Aug  4 02:33:25 2008
@@ -84,9 +84,14 @@
 }
 
 static gboolean
-panel_menu_bar_hide_tooltip (GtkWidget    *widget,
-			     PanelMenuBar *menubar)
+panel_menu_bar_hide_tooltip_and_focus (GtkWidget    *widget,
+				       PanelMenuBar *menubar)
 {
+	/* remove focus that would be drawn on the currently focused child of
+	 * the toplevel. See bug#308632. */
+	gtk_window_set_focus (GTK_WINDOW (menubar->priv->panel->toplevel),
+			      NULL);
+
 	g_object_set (widget, "has-tooltip", FALSE, NULL);
 
 	return FALSE;
@@ -106,15 +111,15 @@
 	/* Hide tooltip if a menu is activated */
 	g_signal_connect (menubar->priv->applications_item,
 			  "activate",
-			  G_CALLBACK (panel_menu_bar_hide_tooltip),
+			  G_CALLBACK (panel_menu_bar_hide_tooltip_and_focus),
 			  menubar);
 	g_signal_connect (menubar->priv->places_item,
 			  "activate",
-			  G_CALLBACK (panel_menu_bar_hide_tooltip),
+			  G_CALLBACK (panel_menu_bar_hide_tooltip_and_focus),
 			  menubar);
 	g_signal_connect (menubar->priv->desktop_item,
 			  "activate",
-			  G_CALLBACK (panel_menu_bar_hide_tooltip),
+			  G_CALLBACK (panel_menu_bar_hide_tooltip_and_focus),
 			  menubar);
 
 	/* Reset tooltip when the menu bar is not used */