diff options
| author | Sungyoon Cho <[email protected]> | 2024-04-20 02:46:16 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-19 18:46:16 +0100 |
| commit | dd39cd7e420750ac832e1c3e51fac87c16ae8ea3 (patch) | |
| tree | c7b8afe048df28dd04673d46ad673d5c812e87d4 | |
| parent | 4d0a63523751a590a521fd873f770825023069ae (diff) | |
| download | Hyprland-dd39cd7e420750ac832e1c3e51fac87c16ae8ea3.tar.gz Hyprland-dd39cd7e420750ac832e1c3e51fac87c16ae8ea3.zip | |
windows: recalculate monitor after updating windows (#5647)
Recalculate monitor after updating windows, so layout render doesn't get
overridden.
| -rw-r--r-- | src/desktop/Window.cpp | 9 | ||||
| -rw-r--r-- | src/managers/KeybindManager.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp index b81cb1a4..737d5ef7 100644 --- a/src/desktop/Window.cpp +++ b/src/desktop/Window.cpp @@ -392,8 +392,12 @@ void CWindow::moveToWorkspace(PHLWORKSPACE pWorkspace) { g_pCompositor->updateWorkspaceWindows(OLDWORKSPACE->m_iID); g_pCompositor->updateWorkspaceSpecialRenderData(OLDWORKSPACE->m_iID); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(OLDWORKSPACE->m_iMonitorID); + g_pCompositor->updateWorkspaceWindows(workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m_iMonitorID); + g_pCompositor->updateAllWindowsAnimatedDecorationValues(); if (valid(pWorkspace)) { @@ -486,6 +490,7 @@ void CWindow::onUnmap() { g_pCompositor->updateWorkspaceWindows(workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m_iMonitorID); g_pCompositor->updateAllWindowsAnimatedDecorationValues(); m_pWorkspace.reset(); @@ -853,9 +858,9 @@ void CWindow::createGroup() { addWindowDeco(std::make_unique<CHyprGroupBarDecoration>(this)); - g_pLayoutManager->getCurrentLayout()->recalculateWindow(this); g_pCompositor->updateWorkspaceWindows(workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m_iMonitorID); g_pCompositor->updateAllWindowsAnimatedDecorationValues(); } } @@ -871,6 +876,7 @@ void CWindow::destroyGroup() { updateWindowDecos(); g_pCompositor->updateWorkspaceWindows(workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m_iMonitorID); g_pCompositor->updateAllWindowsAnimatedDecorationValues(); return; } @@ -901,6 +907,7 @@ void CWindow::destroyGroup() { g_pCompositor->updateWorkspaceWindows(workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m_iMonitorID); g_pCompositor->updateAllWindowsAnimatedDecorationValues(); } diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index e6d54ae1..1758f333 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -211,6 +211,7 @@ bool CKeybindManager::ensureMouseBindState() { g_pCompositor->updateWorkspaceWindows(lastDraggedWindow->workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(lastDraggedWindow->workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(lastDraggedWindow->m_iMonitorID); g_pCompositor->updateAllWindowsAnimatedDecorationValues(); return true; @@ -872,6 +873,7 @@ static void toggleActiveFloatingCore(std::string args, std::optional<bool> float } g_pCompositor->updateWorkspaceWindows(PWINDOW->workspaceID()); g_pCompositor->updateWorkspaceSpecialRenderData(PWINDOW->workspaceID()); + g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PWINDOW->m_iMonitorID); g_pCompositor->updateAllWindowsAnimatedDecorationValues(); } |