summaryrefslogtreecommitdiff
path: root/src/events/Windows.cpp
diff options
context:
space:
mode:
authorKhiet Tam Nguyen <86177399+nktnet1@users.noreply.github.com>2024-07-14 04:44:32 +1000
committerGitHub <noreply@github.com>2024-07-13 20:44:32 +0200
commitbc6b0880dda2607a80f000c134f573c970452a0f (patch)
treea29d8879f32859029b22051ecfde6dd18393b2d2 /src/events/Windows.cpp
parented6c701144b827869e0c0fca7a7849ec251bf9ef (diff)
window: override noMaximize if new window takes over fullscreen (#6812) (#6870)
Diffstat (limited to 'src/events/Windows.cpp')
-rw-r--r--src/events/Windows.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index 1612deeb..44e8fa02 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -465,9 +465,11 @@ void Events::listener_mapWindow(void* owner, void* data) {
PWINDOW->m_bNoInitialFocus = true;
else if (*PNEWTAKESOVERFS == 2)
g_pCompositor->setWindowFullscreen(g_pCompositor->getFullscreenWindowOnWorkspace(PWINDOW->m_pWorkspace->m_iID), false, FULLSCREEN_INVALID);
- else if (PWINDOW->m_pWorkspace->m_efFullscreenMode == FULLSCREEN_MAXIMIZED)
+ else if (PWINDOW->m_pWorkspace->m_efFullscreenMode == FULLSCREEN_MAXIMIZED) {
requestsMaximize = true;
- else
+ if (*PNEWTAKESOVERFS == 1)
+ overridingNoMaximize = true;
+ } else
requestsFullscreen = true;
}