From 2bc29f32ec087f8577ff1fd6bb031ea47b133057 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 22 Mar 2022 21:28:57 +0100
Subject: finally fixed XWayland popups

---
 src/Compositor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Compositor.cpp')

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index e747e597..953ae1c8 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -321,7 +321,7 @@ void CCompositor::focusSurface(wlr_surface* pSurface) {
         return;  // Don't focus when already focused on this.
 
     // Unfocus last surface
-    if (m_pLastFocus)
+    if (m_pLastFocus && !wlr_surface_is_xwayland_surface(m_pLastFocus))
         g_pXWaylandManager->activateSurface(m_pLastFocus, false);
 
     const auto KEYBOARD = wlr_seat_get_keyboard(m_sSeat.seat);
-- 
cgit v1.2.3