From: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon, 19 Sep 2016 14:11:54 +0000 (+0200)
Subject: gtkwindow: Update shadow size on state change
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~1167
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4cb1b96;p=gtk%2B3.0.git

gtkwindow: Update shadow size on state change

Otherwise, with CSD, we could have a discrepancy where gtk uses the
right values for the shadows whereas the gdk backend still uses the old
values, leading in some cases to invalid or negative min size being
computed (which, in Wayland, leads a protocol error).

https://bugzilla.gnome.org/show_bug.cgi?id=771561
---

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index fc1e050f77..9808475f73 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7528,6 +7528,19 @@ update_window_style_classes (GtkWindow *window)
     gtk_style_context_remove_class (context, "fullscreen");
 }
 
+static void
+update_window_borders (GtkWindow *window)
+{
+  GtkWindowPrivate *priv = window->priv;
+  GtkBorder window_border = { 0 };
+
+  if (priv->client_decorated && priv->use_client_shadow)
+    {
+      get_shadow_width (window, &window_border);
+      update_shadow_width (window, &window_border);
+    }
+}
+
 static void
 popover_size_allocate (GtkWidget        *widget,
                        GtkWindowPopover *popover,
@@ -7798,6 +7811,7 @@ gtk_window_state_event (GtkWidget           *widget,
     {
       update_window_style_classes (window);
       update_window_buttons (window);
+      update_window_borders (window);
       gtk_widget_queue_resize (widget);
     }