summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrszyma <rszyma.dev@gmail.com>2025-04-13 00:58:38 +0200
committerGitHub <noreply@github.com>2025-04-13 00:58:38 +0200
commit4d85e7996d862b5e9aa4b29e2327058576a2cb41 (patch)
treebba0e461d8aa89820f9fe42a2b7dcdc4198f8494 /src
parent2da4f427ea97a11d1d28dfd1324984a8584fc699 (diff)
dwindle: ignore fullscreen window for positioning when use_active_for_splits=false (#9838)
* fix(dwindle): ignore fullscreen window for positioning when use_active_for_splits=false * rename NON_FULLSCREEN -> SKIP_FULLSCREEN_PRIORITY
Diffstat (limited to 'src')
-rw-r--r--src/Compositor.cpp2
-rw-r--r--src/desktop/Window.hpp15
-rw-r--r--src/layout/DwindleLayout.cpp2
3 files changed, 10 insertions, 9 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 8e520237..49b3a2cb 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -952,7 +952,7 @@ PHLWINDOW CCompositor::vectorToWindowUnified(const Vector2D& pos, uint8_t proper
const WORKSPACEID WSPID = special ? PMONITOR->activeSpecialWorkspaceID() : PMONITOR->activeWorkspaceID();
const auto PWORKSPACE = getWorkspaceByID(WSPID);
- if (PWORKSPACE->m_bHasFullscreenWindow)
+ if (PWORKSPACE->m_bHasFullscreenWindow && !(properties & SKIP_FULLSCREEN_PRIORITY))
return PWORKSPACE->getFullscreenWindow();
auto found = floating(false);
diff --git a/src/desktop/Window.hpp b/src/desktop/Window.hpp
index 3ed4ce75..b314eca5 100644
--- a/src/desktop/Window.hpp
+++ b/src/desktop/Window.hpp
@@ -44,13 +44,14 @@ enum eGroupRules : uint8_t {
};
enum eGetWindowProperties : uint8_t {
- WINDOW_ONLY = 0,
- RESERVED_EXTENTS = 1 << 0,
- INPUT_EXTENTS = 1 << 1,
- FULL_EXTENTS = 1 << 2,
- FLOATING_ONLY = 1 << 3,
- ALLOW_FLOATING = 1 << 4,
- USE_PROP_TILED = 1 << 5,
+ WINDOW_ONLY = 0,
+ RESERVED_EXTENTS = 1 << 0,
+ INPUT_EXTENTS = 1 << 1,
+ FULL_EXTENTS = 1 << 2,
+ FLOATING_ONLY = 1 << 3,
+ ALLOW_FLOATING = 1 << 4,
+ USE_PROP_TILED = 1 << 5,
+ SKIP_FULLSCREEN_PRIORITY = 1 << 6,
};
enum eSuppressEvents : uint8_t {
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index ecd7abea..0058c890 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -246,7 +246,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dir
if (PMONITOR->ID == MONFROMCURSOR->ID &&
(PNODE->workspaceID == PMONITOR->activeWorkspaceID() || (g_pCompositor->isWorkspaceSpecial(PNODE->workspaceID) && PMONITOR->activeSpecialWorkspace)) && !*PUSEACTIVE) {
- OPENINGON = getNodeFromWindow(g_pCompositor->vectorToWindowUnified(MOUSECOORDS, RESERVED_EXTENTS | INPUT_EXTENTS));
+ OPENINGON = getNodeFromWindow(g_pCompositor->vectorToWindowUnified(MOUSECOORDS, RESERVED_EXTENTS | INPUT_EXTENTS | SKIP_FULLSCREEN_PRIORITY));
if (!OPENINGON && g_pCompositor->isPointOnReservedArea(MOUSECOORDS, PMONITOR))
OPENINGON = getClosestNodeOnWorkspace(PNODE->workspaceID, MOUSECOORDS);