reverted my last change and applied owen's leaner conditional flag update

Tue Oct  5 21:00:54 2004  Tim Janik  <timj@gtk.org>

        * gtk/gtkwidget.c (gtk_widget_size_allocate): reverted my last change
        and applied owen's leaner conditional flag update which should be good
        enough to preserve resizing flag invariants.

diff --git a/ChangeLog b/ChangeLog
index 643373e30be45fc6abb13d04bc93997f08037c17..cb37cac8d4f8828ace84debeb989a18080b049db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct  5 21:00:54 2004  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.c (gtk_widget_size_allocate): reverted my last change 
+       and applied owen's leaner conditional flag update which should be good
+       enough to preserve resizing flag invariants.
+
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 643373e30be45fc6abb13d04bc93997f08037c17..cb37cac8d4f8828ace84debeb989a18080b049db 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Oct  5 21:00:54 2004  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.c (gtk_widget_size_allocate): reverted my last change 
+       and applied owen's leaner conditional flag update which should be good
+       enough to preserve resizing flag invariants.
+
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 643373e30be45fc6abb13d04bc93997f08037c17..cb37cac8d4f8828ace84debeb989a18080b049db 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Oct  5 21:00:54 2004  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.c (gtk_widget_size_allocate): reverted my last change 
+       and applied owen's leaner conditional flag update which should be good
+       enough to preserve resizing flag invariants.
+
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 643373e30be45fc6abb13d04bc93997f08037c17..cb37cac8d4f8828ace84debeb989a18080b049db 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Oct  5 21:00:54 2004  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkwidget.c (gtk_widget_size_allocate): reverted my last change 
+       and applied owen's leaner conditional flag update which should be good
+       enough to preserve resizing flag invariants.
+
 2004-10-05  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 89927522668307312a6101519b03ceec942ba824..ad1257c97eb0cde8929d08de17d9b545f53a1c58 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2675,7 +2675,8 @@ gtk_widget_size_allocate (GtkWidget       *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   alloc_needed = GTK_WIDGET_ALLOC_NEEDED (widget);
-  GTK_PRIVATE_UNSET_FLAG (widget, GTK_ALLOC_NEEDED);
+  if (!GTK_WIDGET_REQUEST_NEEDED (widget))      /* Preserve request/allocate ordering */
+    GTK_PRIVATE_UNSET_FLAG (widget, GTK_ALLOC_NEEDED);
 
   old_allocation = widget->allocation;
   real_allocation = *allocation;
@@ -2705,13 +2706,7 @@ gtk_widget_size_allocate (GtkWidget      *widget,
                      old_allocation.y != real_allocation.y);
 
   if (!alloc_needed && !size_changed && !position_changed)
-    {
-      if (GTK_WIDGET_REQUEST_NEEDED (widget))
-        { /* another resize has been queued */
-          gtk_widget_queue_resize (widget);
-        }
-      return;
-    }
+    return;
   
   g_signal_emit (widget, widget_signals[SIZE_ALLOCATE], 0, &real_allocation);
 
@@ -2750,11 +2745,6 @@ gtk_widget_size_allocate (GtkWidget      *widget,
       gtk_widget_invalidate_widget_windows (widget->parent, invalidate);
       gdk_region_destroy (invalidate);
     }
-  
-  if (GTK_WIDGET_REQUEST_NEEDED (widget))
-    { /* another resize has been queued */
-      gtk_widget_queue_resize (widget);
-    }
 }
 
 /**