[metacity/issue-8: 9/10] Revert "window: stop updating layers on focus changes"

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 00bdcba6803a7c171891c64a13dfcc8f4e2685cd
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Mar 6 18:14:12 2020 +0200

    Revert "window: stop updating layers on focus changes"
    
    This reverts commit 12c4f35ca5a6f596518d50b2b2c647608c3d3410.
    
    https://gitlab.gnome.org/GNOME/metacity/issues/8

 src/core/window.c | 6 ++++++
 1 file changed, 6 insertions(+)
---
diff --git a/src/core/window.c b/src/core/window.c
index ab86382b..2d4e0ec7 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5979,6 +5979,9 @@ meta_window_set_focused_internal (MetaWindow *window,
       XInstallColormap (window->display->xdisplay, window->colormap);
       meta_error_trap_pop (window->display);
 
+      /* move into FOCUSED_WINDOW layer */
+      meta_window_update_layer (window);
+
       /* Ungrab click to focus button since the sync grab can interfere
        * with some things you might do inside the focused window, by
        * causing the client to get funky enter/leave events.
@@ -6016,6 +6019,9 @@ meta_window_set_focused_internal (MetaWindow *window,
       XUninstallColormap (window->display->xdisplay, window->colormap);
       meta_error_trap_pop (window->display);
 
+      /* move out of FOCUSED_WINDOW layer */
+      meta_window_update_layer (window);
+
       /* Re-grab for click to focus and raise-on-click, if necessary */
       if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
           !meta_prefs_get_raise_on_click ())