Don't process configure events that just move the window, and don't resize

Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
	that just move the window, and don't resize it. Because we need
	to make sure that a widget gets redrawn after a size_allocate -
	and that only happens when the configure event changes the size
	of the window. Plus, it's inefficient.

diff --git a/ChangeLog b/ChangeLog
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e99c1f85ce2ca6d0460b683b12c18b22e182ac64..4a094fcf4a82d6a4408fb58def1602f9cfa025a6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Feb 23 15:41:13 1998  Owen Taylor  <owt1@cornell.edu>
+
+       * gtk/gtkwidget.c gtk/gtkmenu.c: Don't process configure events
+       that just move the window, and don't resize it. Because we need
+       to make sure that a widget gets redrawn after a size_allocate -
+       and that only happens when the configure event changes the size
+       of the window. Plus, it's inefficient.
+       
 Mon Feb 23 15:45:37 1998  Marc Ewing <marc@redhat.com>
 
        * gtk/gtktoolbar.h:

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 2f1f7c347c730d9e6db08836b9116bc0132ef372..9cbd961a0b85dbb064bf284dbc5ecb6252bbbb99 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -710,6 +710,11 @@ gtk_menu_configure (GtkWidget         *widget,
   g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
+  /* If the window was merely moved, do nothing */
+  if ((widget->allocation.width == event->width) &&
+      (widget->allocation.height == event->height))
+    return FALSE;
+
   if (GTK_MENU_SHELL (widget)->menu_flag)
     {
       GTK_MENU_SHELL (widget)->menu_flag = FALSE;

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 7c2b3534a95f4ea877453214b60024200c533d0e..a805bfc92c04589c2c30d850d893827877337d8d 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -716,6 +716,11 @@ gtk_window_configure_event (GtkWidget         *widget,
   g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
+  /* If the window was merely moved, do nothing */
+  if ((widget->allocation.width == event->width) &&
+      (widget->allocation.height == event->height))
+    return FALSE;
+
   window = GTK_WINDOW (widget);
   window->handling_resize = TRUE;