Don't unnecessarily call gtk_menu_position(), since that function has

2004-11-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily
	call gtk_menu_position(), since that function has issues
	when called on a menu whose parent is unrealized.  (#157354,
	Adam Hooper)

diff --git a/ChangeLog b/ChangeLog
index f06b938c1c35a47acbb27ee087c364f88c45c13c..a2699eca1d741c521177da3926ff6da61eb961ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily
+       call gtk_menu_position(), since that function has issues
+       when called on a menu whose parent is unrealized.  (#157354,
+       Adam Hooper)
+
        * gtk/gtkmain.c: Document new functions.
 
 2004-11-04  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f06b938c1c35a47acbb27ee087c364f88c45c13c..a2699eca1d741c521177da3926ff6da61eb961ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily
+       call gtk_menu_position(), since that function has issues
+       when called on a menu whose parent is unrealized.  (#157354,
+       Adam Hooper)
+
        * gtk/gtkmain.c: Document new functions.
 
 2004-11-04  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f06b938c1c35a47acbb27ee087c364f88c45c13c..a2699eca1d741c521177da3926ff6da61eb961ca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily
+       call gtk_menu_position(), since that function has issues
+       when called on a menu whose parent is unrealized.  (#157354,
+       Adam Hooper)
+
        * gtk/gtkmain.c: Document new functions.
 
 2004-11-04  Matthias Clasen  <mclasen@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f06b938c1c35a47acbb27ee087c364f88c45c13c..a2699eca1d741c521177da3926ff6da61eb961ca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily
+       call gtk_menu_position(), since that function has issues
+       when called on a menu whose parent is unrealized.  (#157354,
+       Adam Hooper)
+
        * gtk/gtkmain.c: Document new functions.
 
 2004-11-04  Matthias Clasen  <mclasen@redhat.com>

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 5688080be1508243583cad5fc52581bcf5e14aff..3dd53c8fa83f55ed40a9f84af1a1ab984094fcf2 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -980,6 +980,12 @@ menu_change_screen (GtkMenu   *menu,
 {
   GtkMenuPrivate *private = gtk_menu_get_private (menu);
 
+  if (gtk_widget_has_screen (menu))
+    {
+      if (new_screen == gtk_widget_get_screen (menu))
+       return;
+    }
+
   if (menu->torn_off)
     {
       gtk_window_set_screen (GTK_WINDOW (menu->tearoff_window), new_screen);
@@ -1705,7 +1711,7 @@ gtk_menu_set_tearoff_hints (GtkMenu *menu,
   geometry_hints.max_width = width;
     
   geometry_hints.min_height = 0;
-  geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height;
+  geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height + 10;
 
   gtk_window_set_geometry_hints (GTK_WINDOW (menu->tearoff_window),
                                 NULL,