From 75c2a378e3c9368feb57a31710de26decc3da3bc Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 7 Jul 2022 21:47:59 +0200
Subject: unfocus keyboard on refocus null

---
 src/Compositor.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Compositor.cpp')

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 453b74e9..040f770e 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -594,13 +594,13 @@ void CCompositor::focusSurface(wlr_surface* pSurface, CWindow* pWindowOwner) {
     if (m_sSeat.seat->keyboard_state.focused_surface == pSurface || (pWindowOwner && m_sSeat.seat->keyboard_state.focused_surface == g_pXWaylandManager->getWindowSurface(pWindowOwner)))
         return;  // Don't focus when already focused on this.
 
+    // Unfocus last surface if should
+    if (m_pLastFocus && ((m_sSeat.seat->keyboard_state.focused_surface && wlr_surface_is_xdg_surface(m_pLastFocus)) || !pSurface))
+        g_pXWaylandManager->activateSurface(m_pLastFocus, false);
+
     if (!pSurface)
         return;
 
-    // Unfocus last surface if should
-    if (m_pLastFocus && m_sSeat.seat->keyboard_state.focused_surface && wlr_surface_is_xdg_surface(m_pLastFocus))
-        wlr_xdg_toplevel_set_activated(wlr_xdg_surface_from_wlr_surface(m_pLastFocus)->toplevel, false);
-
     const auto KEYBOARD = wlr_seat_get_keyboard(m_sSeat.seat);
 
     if (!KEYBOARD)
-- 
cgit v1.2.3