[maemo-commits] [maemo-commits] r8197 - in projects/haf/trunk/gtk+: . gtk

[From: tko at stage.maemo.org]

Author: tko
Date: 2006-11-21 11:12:48 +0200 (Tue, 21 Nov 2006)
New Revision: 8197

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkwidget.c
Log:
NB#46971: Attach tap-and-hold menu to the widget to get window stacking right.

2006-11-21  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkwidget.c (gtk_widget_tap_and_hold_setup_real): Attach the
	menu to the widget (unless already attached with something) to get
	window stacking right. NB#46971


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2006-11-21 09:07:23 UTC (rev 8196)
+++ projects/haf/trunk/gtk+/ChangeLog	2006-11-21 09:12:48 UTC (rev 8197)
@@ -1,4 +1,10 @@
 2006-11-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkwidget.c (gtk_widget_tap_and_hold_setup_real): Attach the
+	menu to the widget (unless already attached with something) to get
+	window stacking right. NB#46971
+
+2006-11-21  Tommi Komulainen  <tommi.komulainen at nokia.com>
 	
 	* gtk/gtkmenu.c (gtk_menu_attach_to_widget, gtk_menu_detach): Allow
 	detach function to be NULL.

Modified: projects/haf/trunk/gtk+/gtk/gtkwidget.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwidget.c	2006-11-21 09:07:23 UTC (rev 8196)
+++ projects/haf/trunk/gtk+/gtk/gtkwidget.c	2006-11-21 09:12:48 UTC (rev 8197)
@@ -8098,6 +8098,9 @@
       g_object_ref (menu);
       gtk_object_sink (GTK_OBJECT (menu));
       _gtk_menu_enable_context_menu_behavior (GTK_MENU (menu));
+
+      if (gtk_menu_get_attach_widget (menu) == NULL)
+	gtk_menu_attach_to_widget (menu, widget, NULL);
     }
 
   td->menu = menu;