This commit is contained in:
Vaxry 2024-08-24 20:58:21 +02:00
parent d3e26652d6
commit 85917a40b0

View File

@ -513,10 +513,10 @@ void CHyprRenderer::renderWorkspaceWindows(CMonitor* pMonitor, PHLWORKSPACE pWor
// firstly, render all workspaces in sync, but leave out main workspace
for (auto& [k, v] : toRender) {
if (k == pWorkspace)
if (k == pWorkspace || !k)
continue;
const bool SCALE = k && k->m_fScaleClients.value() != 1.F && g_pCompositor->getWindowsOnWorkspace(k->m_iID) > 0;
const bool SCALE = k->m_fScaleClients.value() != 1.F && g_pCompositor->getWindowsOnWorkspace(k->m_iID) > 0;
if (SCALE)
preWorkspaceScaleAnim();
@ -535,9 +535,17 @@ void CHyprRenderer::renderWorkspaceWindows(CMonitor* pMonitor, PHLWORKSPACE pWor
preWorkspaceScaleAnim();
// lastly, render the current ws
if (toRender.contains(pWorkspace)) {
for (auto& [window, mode] : toRender[pWorkspace]) {
renderWindow(window, pMonitor, time, true, mode);
}
}
// and the null ws (windows fading out)
if (toRender.contains(nullptr)) {
for (auto& [window, mode] : toRender[nullptr]) {
renderWindow(window, pMonitor, time, true, mode);
}
}
if (SCALE)
postWorkspaceScaleAnim(pWorkspace);