From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Wed, 4 Oct 2017 18:33:15 +0000 (-0300)
Subject: display-x11: Unset tiled state if _GTK_EDGE_CONSTRAINTS is supported
X-Git-Tag: archive/raspbian/3.22.24-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5c8cd2f250966eaad4f60bcfc849ef617742846;p=gtk%2B3.0.git

display-x11: Unset tiled state if _GTK_EDGE_CONSTRAINTS is supported

Commit c415bef5de introduced support for the new _GTK_EDGE_CONSTRAINTS
atom. If the compositor supports that atom, however, we were always
setting the tiled state, even if no actual tiling information is
available, where the correct action is to completely remove any traces
of the tiled state.

Fix that by correctly removing the tiled state when compositor supports
_GTK_EDGE_CONSTRAINTS Xatom.

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

Gbp-Pq: Name 0003-display-x11-Unset-tiled-state-if-_GTK_EDGE_CONSTRAIN.patch
---

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index e9a263f23d..964edbccae 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -228,10 +228,8 @@ do_edge_constraint_state_check (GdkWindow      *window,
     }
   else
     {
-      if (!(old_state & GDK_WINDOW_STATE_TILED))
-        {
-          local_set |= GDK_WINDOW_STATE_TILED;
-        }
+      if (old_state & GDK_WINDOW_STATE_TILED)
+        local_unset |= GDK_WINDOW_STATE_TILED;
     }
 
   /* Top edge */