From 472e2b2624d9fe3b92f2139fbd53771f4e9709b3 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 19 Apr 2020 15:15:50 +0200
Subject: Fix layer sufaces holding focus after unmap

---
 src/output.zig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/output.zig')

diff --git a/src/output.zig b/src/output.zig
index fa09b07..34769f1 100644
--- a/src/output.zig
+++ b/src/output.zig
@@ -259,7 +259,10 @@ pub const Output = struct {
             var it = self.layers[layer].last;
             while (it) |node| : (it = node.prev) {
                 const layer_surface = &node.data;
-                if (layer_surface.wlr_layer_surface.current.keyboard_interactive) {
+                // Only mapped surfaces may gain focus
+                if (layer_surface.mapped and
+                    layer_surface.wlr_layer_surface.current.keyboard_interactive)
+                {
                     break :outer layer_surface;
                 }
             }
-- 
cgit v1.2.3