hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-25 03:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge 5243a8dde9 into f88deb928a

Browse source
This commit is contained in:
xolider 2025-12-17 20:19:06 -05:00 • committed by GitHub
commit 9d6280ddb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/layout/MasterLayout.cpp
View file

@ -978,6 +978,11 @@ void CHyprMasterLayout::moveWindowTo(PHLWINDOW pWindow, const std::string& dir,
if (pWindow->m_workspace != PWINDOW2->m_workspace) { if (pWindow->m_workspace != PWINDOW2->m_workspace) {
// if different monitors, send to monitor // if different monitors, send to monitor
// capture previous state before removal
const auto OLDNODE = getNodeFromWindow(pWindow);
const auto SRCMON = pWindow->m_monitor.lock();
const bool WASSLAVE = OLDNODE ? !OLDNODE->isMaster : false;
onWindowRemovedTiling(pWindow); onWindowRemovedTiling(pWindow);
pWindow->moveToWorkspace(PWINDOW2->m_workspace); pWindow->moveToWorkspace(PWINDOW2->m_workspace);
pWindow->m_monitor = PWINDOW2->m_monitor; pWindow->m_monitor = PWINDOW2->m_monitor;
@ -986,6 +991,33 @@ void CHyprMasterLayout::moveWindowTo(PHLWINDOW pWindow, const std::string& dir,
Desktop::focusState()->rawMonitorFocus(pMonitor); Desktop::focusState()->rawMonitorFocus(pMonitor);
} }
onWindowCreatedTiling(pWindow); onWindowCreatedTiling(pWindow);
// Promotion rule: make slave -> master ONLY when moving from left monitor to right monitor
// Determine left->right by comparing monitor X positions
const auto DSTMON = pWindow->m_monitor.lock();
if (SRCMON && DSTMON && WASSLAVE && SRCMON->m_position.x < DSTMON->m_position.x) {
// get the freshly created node on destination workspace
const auto NEWNODE = getNodeFromWindow(pWindow);
if (NEWNODE) {
const auto OLDMASTER = getMasterNodeOnWorkspace(NEWNODE->workspaceID);
if (OLDMASTER && OLDMASTER != NEWNODE) {
const auto OLDMASTERIT = std::ranges::find(m_masterNodesData, *OLDMASTER);
// promote the moved window to master
NEWNODE->isMaster = true;
if (OLDMASTERIT != m_masterNodesData.end()) {
const auto NEWNODEIT = std::ranges::find(m_masterNodesData, *NEWNODE);
// place the new master at the old master's position
m_masterNodesData.splice(OLDMASTERIT, m_masterNodesData, NEWNODEIT);
// demote old master and move it to the end (consistent with rollnext behavior)
OLDMASTER->isMaster = false;
m_masterNodesData.splice(m_masterNodesData.end(), m_masterNodesData, OLDMASTERIT);
}
// focus the moved window and recalc the destination monitor
g_pCompositor->focusWindow(pWindow);
recalculateMonitor(pWindow->monitorID());
}
}
}
} else { } else {
// if same monitor, switch windows // if same monitor, switch windows
switchWindows(pWindow, PWINDOW2); switchWindows(pWindow, PWINDOW2);