mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-08 00:25:58 +01:00
better fix the last fix
This commit is contained in:
parent
920727cbba
commit
28867758c4
3 changed files with 7 additions and 3 deletions
|
@ -1411,9 +1411,7 @@ void CCompositor::setWindowFullscreen(CWindow* pWindow, bool on, eFullscreenMode
|
||||||
if (!windowValidMapped(pWindow))
|
if (!windowValidMapped(pWindow))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!isWorkspaceVisible(pWindow->m_iWorkspaceID)) {
|
focusWindow(pWindow);
|
||||||
g_pKeybindManager->changeworkspace("[internal]" + std::to_string(pWindow->m_iWorkspaceID));
|
|
||||||
}
|
|
||||||
|
|
||||||
g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(pWindow, mode, on);
|
g_pLayoutManager->getCurrentLayout()->fullscreenRequestForWindow(pWindow, mode, on);
|
||||||
|
|
||||||
|
|
|
@ -628,6 +628,9 @@ void CHyprDwindleLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscree
|
||||||
if (!g_pCompositor->windowValidMapped(pWindow))
|
if (!g_pCompositor->windowValidMapped(pWindow))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!g_pCompositor->isWorkspaceVisible(pWindow->m_iWorkspaceID))
|
||||||
|
return;
|
||||||
|
|
||||||
if (on == pWindow->m_bIsFullscreen)
|
if (on == pWindow->m_bIsFullscreen)
|
||||||
return; // ignore
|
return; // ignore
|
||||||
|
|
||||||
|
|
|
@ -320,6 +320,9 @@ void CHyprMasterLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscreen
|
||||||
if (!g_pCompositor->windowValidMapped(pWindow))
|
if (!g_pCompositor->windowValidMapped(pWindow))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!g_pCompositor->isWorkspaceVisible(pWindow->m_iWorkspaceID))
|
||||||
|
return;
|
||||||
|
|
||||||
if (on == pWindow->m_bIsFullscreen)
|
if (on == pWindow->m_bIsFullscreen)
|
||||||
return; // ignore
|
return; // ignore
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue