From f7174acc4850ac93feb291707de9d9861c9fab56 Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 28 Oct 2022 19:18:10 +0100 Subject: minor fixes for xwayland refocus --- src/managers/XWaylandManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/managers/XWaylandManager.cpp') diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index 89bb6871..3f6c2371 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -53,11 +53,13 @@ void CHyprXWaylandManager::activateSurface(wlr_surface* pSurface, bool activate) void CHyprXWaylandManager::activateWindow(CWindow* pWindow, bool activate) { if (pWindow->m_bIsX11) { - if (pWindow->m_uSurface.xwayland->minimized) - wlr_xwayland_surface_set_minimized(pWindow->m_uSurface.xwayland, false); + if (activate) { + wlr_xwayland_surface_set_minimized(pWindow->m_uSurface.xwayland, false); + wlr_xwayland_surface_restack(pWindow->m_uSurface.xwayland, NULL, XCB_STACK_MODE_ABOVE); + } + wlr_xwayland_surface_activate(pWindow->m_uSurface.xwayland, activate); - wlr_xwayland_surface_restack(pWindow->m_uSurface.xwayland, NULL, XCB_STACK_MODE_ABOVE); } else wlr_xdg_toplevel_set_activated(pWindow->m_uSurface.xdg->toplevel, activate); -- cgit v1.2.3