[maemo-commits] [maemo-commits] r10668 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-03-20 18:36:34 +0200 (Tue, 20 Mar 2007)
New Revision: 10668

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c
Log:
2007-03-20  Michael Natterer  <mitch at imendio.com>

	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu)
	* gtk/gtkmenu.c (gtk_menu_init)
	(gtk_menu_position): remove patch that used to set all menu window
	type hints to GTK_WINDOW_TYPE_HINT_MENU.

	(gtk_menu_window_visibility_notify_event): don't pop down the menu
	if obscured by windows of TYPE_HINT_POPUP_MENU or
	TYPE_HINT_DROPDOWN_MENU.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-20 15:51:47 UTC (rev 10667)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-20 16:36:34 UTC (rev 10668)
@@ -1,3 +1,14 @@
+2007-03-20  Michael Natterer  <mitch at imendio.com>
+
+	* gtk/gtkmenuitem.c (gtk_menu_item_position_menu)
+	* gtk/gtkmenu.c (gtk_menu_init)
+	(gtk_menu_position): remove patch that used to set all menu window
+	type hints to GTK_WINDOW_TYPE_HINT_MENU.
+
+	(gtk_menu_window_visibility_notify_event): don't pop down the menu
+	if obscured by windows of TYPE_HINT_POPUP_MENU or
+	TYPE_HINT_DROPDOWN_MENU.
+
 2007-03-15  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk+-2.0.pc.in (Cflags): remove -DMAEMO_CHANGES, it's intentionally

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-03-20 15:51:47 UTC (rev 10667)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-03-20 16:36:34 UTC (rev 10668)
@@ -891,15 +891,11 @@
                                      "signal::visibility_notify_event", gtk_menu_window_visibility_notify_event, menu,
 #endif /* MAEMO_CHANGES */
 				     NULL);
-#ifdef MAEMO_CHANGES
-  gtk_window_set_decorated (GTK_WINDOW (menu->toplevel), FALSE);
-  gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel),
-                            GDK_WINDOW_TYPE_HINT_MENU);
-#endif /* MAEMO_CHANGES */
   gtk_window_set_resizable (GTK_WINDOW (menu->toplevel), FALSE);
   gtk_window_set_mnemonic_modifier (GTK_WINDOW (menu->toplevel), 0);
 
 #ifdef MAEMO_CHANGES
+  gtk_window_set_decorated (GTK_WINDOW (menu->toplevel), FALSE);
   gtk_widget_add_events (menu->toplevel, GDK_VISIBILITY_NOTIFY_MASK);
 #endif /* MAEMO_CHANGES */
 
@@ -4001,11 +3997,7 @@
 
   /* Set the type hint here to allow custom position functions to set a different hint */
   if (!GTK_WIDGET_VISIBLE (menu->toplevel))
-#ifdef MAEMO_CHANGES
-    gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel), GDK_WINDOW_TYPE_HINT_MENU);
-#else
     gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel), GDK_WINDOW_TYPE_HINT_POPUP_MENU);
-#endif /* MAEMO_CHANGES */
 
   if (menu->position_func)
     {
@@ -5140,7 +5132,9 @@
           type = gdk_window_get_type_hint (win);
           if (!gdk_error_trap_pop () &&
               (type != GDK_WINDOW_TYPE_HINT_NOTIFICATION) &&
-              (type != GDK_WINDOW_TYPE_HINT_MENU))
+              (type != GDK_WINDOW_TYPE_HINT_MENU)         &&
+              (type != GDK_WINDOW_TYPE_HINT_POPUP_MENU)   &&
+              (type != GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU))
             {
               /* A non-message and non-menu window above us; close. */
               deactivate = TRUE;

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-03-20 15:51:47 UTC (rev 10667)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenuitem.c	2007-03-20 16:36:34 UTC (rev 10668)
@@ -1230,6 +1230,7 @@
 #endif /* MAEMO_CHANGES */
 }
 
+#ifdef MAEMO_CHANGES
 void
 _gtk_menu_item_popdown_submenu (GtkWidget *widget)
 {
@@ -1250,6 +1251,7 @@
 
   gtk_widget_queue_draw (widget);
 }
+#endif /* MAEMO_CHANGES */
 
 static void
 get_offsets (GtkMenu *menu,
@@ -1419,13 +1421,8 @@
 
   if (!GTK_WIDGET_VISIBLE (menu->toplevel))
     {
-#ifdef MAEMO_CHANGES
-      gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel),
-				GDK_WINDOW_TYPE_HINT_MENU);
-#else
       gtk_window_set_type_hint (GTK_WINDOW (menu->toplevel), menu_item->from_menubar?
 				GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU : GDK_WINDOW_TYPE_HINT_POPUP_MENU);
-#endif /* MAEMO_CHANGES */
     }
 }