From bc6b0880dda2607a80f000c134f573c970452a0f Mon Sep 17 00:00:00 2001
From: Khiet Tam Nguyen <86177399+nktnet1@users.noreply.github.com>
Date: Sun, 14 Jul 2024 04:44:32 +1000
Subject: [PATCH] window: override noMaximize if new window takes over
 fullscreen (#6812) (#6870)

---
 src/events/Windows.cpp | 6 ++++--
 1 file 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;
     }