From 2dd1661aec80f216a53b897be11ab72611447247 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Tue, 20 Sep 2022 12:17:34 +0100 Subject: [PATCH] fix groups with fullscreen --- src/events/Windows.cpp | 3 +-- src/layout/DwindleLayout.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index ebc25a1b..42aa344b 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -344,8 +344,7 @@ void Events::listener_mapWindow(void* owner, void* data) { // fix fullscreen on requested (basically do a switcheroo) if (PWORKSPACE->m_bHasFullscreenWindow) { const auto PFULLWINDOW = g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID); - g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(PFULLWINDOW, FULLSCREEN_FULL, false); - g_pXWaylandManager->setWindowFullscreen(PFULLWINDOW, PFULLWINDOW->m_bIsFullscreen); + g_pCompositor->setWindowFullscreen(PFULLWINDOW, false, FULLSCREEN_FULL); } PWINDOW->m_vRealPosition.warp(); diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index 0d2e2868..79097267 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -793,11 +793,10 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(PNODE->workspaceID); if (PWORKSPACE->m_bHasFullscreenWindow) - fullscreenRequestForWindow(g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID), FULLSCREEN_FULL, false); + g_pCompositor->setWindowFullscreen(g_pCompositor->getFullscreenWindowOnWorkspace(PWORKSPACE->m_iID), false, FULLSCREEN_FULL); if (PNODE->isGroupMember()) { // dissolve group - const auto PHEAD = PNODE->getGroupHead(); SDwindleNodeData* current = PNODE->pNextGroupMember;