From c4c3b590e5711f7c65e821407c2c81d9e3c6af34 Mon Sep 17 00:00:00 2001 From: MightyPlaza <123664421+MightyPlaza@users.noreply.github.com> Date: Thu, 10 Aug 2023 18:06:39 +0000 Subject: toplevel: patches group toplevel-activated (#2931) * patches group toplevel-activated modified: src/Compositor.cpp modified: src/Window.cpp * remove redundant call modified: src/Compositor.cpp * fix style modified: src/Compositor.cpp --- src/Compositor.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/Compositor.cpp') diff --git a/src/Compositor.cpp b/src/Compositor.cpp index ec70bb68..f2fcceff 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -924,6 +924,16 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) { g_pLayoutManager->getCurrentLayout()->onWindowFocusChange(pWindow); + // TODO: implement this better + if (!PLASTWINDOW && pWindow->m_sGroupData.pNextWindow && pWindow->m_sGroupData.pNextWindow != pWindow) { + auto curr = pWindow; + do { + curr = curr->m_sGroupData.pNextWindow; + if (curr->m_phForeignToplevel) + wlr_foreign_toplevel_handle_v1_set_activated(curr->m_phForeignToplevel, false); + } while (curr->m_sGroupData.pNextWindow != pWindow); + } + if (pWindow->m_phForeignToplevel) wlr_foreign_toplevel_handle_v1_set_activated(pWindow->m_phForeignToplevel, true); -- cgit v1.2.3