aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/xwayland
diff options
context:
space:
mode:
authortrianta <[email protected]>2024-08-25 09:37:03 -0500
committerGitHub <[email protected]>2024-08-25 16:37:03 +0200
commitb672118f9238a48a18efd741cbcda387c5552238 (patch)
tree80e02da0c9ecc419c54ee12d5b3939d1516527eb /src/xwayland
parentaac90d92797825a65b9faab038586a3b88448667 (diff)
downloadHyprland-b672118f9238a48a18efd741cbcda387c5552238.tar.gz
Hyprland-b672118f9238a48a18efd741cbcda387c5552238.zip
xwayland: deactivate xwayland focus if wayland is focused (#7458)
* xwayland: deactivate xwayland focus if wayland is focused * xwayland: deactivate last xwayland surface after focusing wayland
Diffstat (limited to 'src/xwayland')
-rw-r--r--src/xwayland/XWM.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xwayland/XWM.cpp b/src/xwayland/XWM.cpp
index f6b6864c..a409b440 100644
--- a/src/xwayland/XWM.cpp
+++ b/src/xwayland/XWM.cpp
@@ -897,7 +897,7 @@ void CXWM::activateSurface(SP<CXWaylandSurface> surf, bool activate) {
if ((surf == focusedSurface && activate) || (surf && surf->overrideRedirect))
return;
- if (!surf) {
+ if (!surf || (!activate && g_pCompositor->m_pLastWindow && !g_pCompositor->m_pLastWindow->m_bIsX11)) {
setActiveWindow((uint32_t)XCB_WINDOW_NONE);
focusWindow(nullptr);
} else {