From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 30 Dec 2019 05:26:39 +0000 (-0500)
Subject: container: Be more careful with roots
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~475^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=538efd0cc6aaace3e48fe0e3acd838ba36d372f5;p=gtk4.git

container: Be more careful with roots

We were warning if we hit non-container
roots. Instead, call suitable naive api.
---

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index bbc6968bdf..f3813f2b9d 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -36,7 +36,8 @@
 #include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-//#include "gtkwindowprivate.h"
+#include "gtknative.h"
+#include "gtkroot.h"
 
 #include "a11y/gtkcontaineraccessibleprivate.h"
 
@@ -376,8 +377,10 @@ gtk_container_idle_sizer (GdkFrameClock *clock,
     {
       if (GTK_IS_WINDOW (container))
         gtk_window_check_resize (GTK_WINDOW (container));
+      else if (GTK_IS_ROOT (container))
+        gtk_native_check_resize (GTK_NATIVE (container));
       else
-        g_warning ("gtk_container_idle_sizer() called on a non-window");
+        g_warning ("gtk_container_idle_sizer() called on a non-native non-window");
     }
 
   if (!gtk_container_needs_idle_sizer (container))