[gtk+/wip/otte/queue-resize: 31/33] widget: Make gtk_widget_queue_allocate() not resize

[Benjamin Otte <otte src gnome org>]

commit 23717cbf5c49c8895e1f4b547990da3982bc902a
Author: Benjamin Otte <otte redhat com>
Date:   Tue Sep 29 23:19:07 2015 +0200

    widget: Make gtk_widget_queue_allocate() not resize
    
    WARNING WARNING WARNING
      This commit is wpork in progress. If things break, it's your fault. If
      you can't read it, it's also your fault.
    WARNING WARNING WARNING
    
    I'll clean up this commit later. But with this code, stuff works. At
    least in widget-factory.

 gtk/gtkcontainer.c     |   31 ++++++++++++++++++-----------
 gtk/gtkwidget.c        |   50 ++++++++++++++++++++++++++++++++++++++++++++++-
 gtk/gtkwidgetprivate.h |    1 +
 gtk/gtkwindow.c        |    2 +
 4 files changed, 70 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 2c9f959..c872456 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -2141,25 +2141,32 @@ gtk_container_real_check_resize (GtkContainer *container)
   GtkRequisition requisition;
   int baseline;
 
-  gtk_widget_get_preferred_size (widget,
-                                 &requisition, NULL);
-  gtk_widget_get_allocated_size (widget, &allocation, &baseline);
-
-  if (requisition.width > allocation.width ||
-      requisition.height > allocation.height)
+  if (_gtk_widget_get_alloc_needed (widget))
     {
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      if (GTK_IS_RESIZE_CONTAINER (container))
+      gtk_widget_get_preferred_size (widget,
+                                     &requisition, NULL);
+      gtk_widget_get_allocated_size (widget, &allocation, &baseline);
+
+      if (requisition.width > allocation.width ||
+          requisition.height > allocation.height)
         {
-          gtk_widget_size_allocate (widget, &allocation);
+          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+          if (GTK_IS_RESIZE_CONTAINER (container))
+            {
+              gtk_widget_size_allocate (widget, &allocation);
+            }
+          else
+            gtk_widget_queue_resize (widget);
+          G_GNUC_END_IGNORE_DEPRECATIONS;
         }
       else
-        gtk_widget_queue_resize (widget);
-      G_GNUC_END_IGNORE_DEPRECATIONS;
+        {
+          gtk_widget_size_allocate_with_baseline (widget, &allocation, baseline);
+        }
     }
   else
     {
-      gtk_widget_size_allocate_with_baseline (widget, &allocation, baseline);
+      gtk_widget_ensure_allocate (widget);
     }
 }
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 9192312..f4f1f42 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5574,6 +5574,8 @@ gtk_widget_queue_draw (GtkWidget *widget)
                                 0, 0, rect.width, rect.height);
 }
 
+static void
+gtk_widget_set_alloc_needed (GtkWidget *widget);
 /**
  * gtk_widget_queue_allocate:
  * @widget: a #GtkWidget
@@ -5592,8 +5594,7 @@ gtk_widget_queue_allocate (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  /* for now... */
-  gtk_widget_queue_resize (widget);
+  gtk_widget_set_alloc_needed (widget);
 }
 
 /**
@@ -6082,6 +6083,9 @@ gtk_widget_size_allocate_with_baseline (GtkWidget     *widget,
     }
 
 out:
+  if (priv->alloc_needed_on_child)
+    gtk_widget_ensure_allocate (widget);
+
   gtk_widget_pop_verify_invariants (widget);
 }
 
@@ -16237,6 +16241,14 @@ gtk_widget_set_alloc_needed (GtkWidget *widget)
       if (!priv->visible)
         break;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+      if (GTK_IS_RESIZE_CONTAINER (widget))
+        {
+          gtk_container_queue_resize_handler (GTK_CONTAINER (widget));
+          break;
+        }
+G_GNUC_END_IGNORE_DEPRECATIONS;
+
       widget = priv->parent;
       if (widget == NULL)
         break;
@@ -16247,6 +16259,40 @@ gtk_widget_set_alloc_needed (GtkWidget *widget)
 }
 
 void
+gtk_widget_ensure_allocate (GtkWidget *widget)
+{
+  GtkWidgetPrivate *priv = widget->priv;
+
+  gtk_widget_ensure_resize (widget);
+
+  if (!priv->visible || !priv->child_visible)
+    return;
+
+  /*  This code assumes that we only reach here if the previous
+   *  allocation is still valid (ie no resize was queued).
+   *  If that wasn't true, the parent would have taken care of
+   *  things.
+   */
+  if (priv->alloc_needed)
+    {
+      GtkAllocation allocation;
+      int baseline;
+
+      gtk_widget_get_allocated_size (widget, &allocation, &baseline);
+      gtk_widget_size_allocate_with_baseline (widget, &allocation, baseline);
+    }
+  else if (priv->alloc_needed_on_child)
+    {
+      priv->alloc_needed_on_child = FALSE;
+
+      if (GTK_IS_CONTAINER (widget))
+        gtk_container_foreach (GTK_CONTAINER (widget),
+                               (GtkCallback) gtk_widget_ensure_allocate,
+                               NULL);
+    }
+}
+
+void
 gtk_widget_queue_resize_on_widget (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = widget->priv;
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 5bf498a..60130df 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -169,6 +169,7 @@ void         _gtk_widget_set_shadowed       (GtkWidget *widget,
 gboolean     _gtk_widget_get_alloc_needed   (GtkWidget *widget);
 void         gtk_widget_queue_resize_on_widget (GtkWidget *widget);
 void         gtk_widget_ensure_resize       (GtkWidget *widget);
+void         gtk_widget_ensure_allocate     (GtkWidget *widget);
 void         _gtk_widget_draw               (GtkWidget *widget,
                                             cairo_t   *cr);
 void          _gtk_widget_scale_changed     (GtkWidget *widget);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 660cf33..1822083 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8106,6 +8106,8 @@ gtk_window_check_resize (GtkContainer *container)
    * so handle it like a normal window */
   if (!_gtk_widget_is_toplevel (GTK_WIDGET (container)))
     GTK_CONTAINER_CLASS (gtk_window_parent_class)->check_resize (container);
+  else if (!_gtk_widget_get_alloc_needed (GTK_WIDGET (container)))
+    GTK_CONTAINER_CLASS (gtk_window_parent_class)->check_resize (container);
   else if (gtk_widget_get_visible (GTK_WIDGET (container)))
     gtk_window_move_resize (GTK_WINDOW (container));
 }