[gtk+/wip/carlosg/event-delivery: 104/105] gdk: Ensure to implicitly deactivate grabs when an impl window is hidden

[Carlos Garnacho <carlosg src gnome org>]

commit 117fee513d78426f3c9420b1a8257aaed1c88b3d
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun May 14 21:30:16 2017 +0200

    gdk: Ensure to implicitly deactivate grabs when an impl window is hidden
    
    For some reason this wasn't done on windows with an impl, but it totally should.
    Probably hidden by grabs in menus and somesuch being done on a child window.

 gdk/gdkwindow.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 9a1616c..b117e09 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3879,6 +3879,9 @@ gdk_window_hide (GdkWindow *window)
                                     GDK_WINDOW_STATE_WITHDRAWN);
     }
   else if (was_mapped)
+    window->state = GDK_WINDOW_STATE_WITHDRAWN;
+
+  if (was_mapped)
     {
       GdkDisplay *display;
       GdkSeat *seat;
@@ -3908,7 +3911,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
             }
         }
 
-      window->state = GDK_WINDOW_STATE_WITHDRAWN;
       g_list_free (devices);
     }