twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-01 12:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

master: add ignoremaster to swapwithmaster

Browse Source 
fixes #11042
This commit is contained in:
Vaxry
2025-07-16 15:51:11 +02:00
parent c4a4c34156
commit 5349667992
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/layout/MasterLayout.cpp
View File

@@ -1078,11 +1078,12 @@ std::any CHyprMasterLayout::layoutMessage(SLayoutMessageHeader header, std::stri
auto command = vars[0]; auto command = vars[0];
// swapwithmaster <master | child | auto> // swapwithmaster <master | child | auto> <ignoremaster>
// first message argument can have the following values: // first message argument can have the following values:
// * master - keep the focus at the new master // * master - keep the focus at the new master
// * child - keep the focus at the new child // * child - keep the focus at the new child
// * auto (default) - swap the focus (keep the focus of the previously selected window) // * auto (default) - swap the focus (keep the focus of the previously selected window)
// * ignoremaster - ignore if master is focused
if (command == "swapwithmaster") { if (command == "swapwithmaster") {
const auto PWINDOW = header.pWindow; const auto PWINDOW = header.pWindow;
@@ -1099,13 +1100,15 @@ std::any CHyprMasterLayout::layoutMessage(SLayoutMessageHeader header, std::stri
const auto NEWCHILD = PMASTER->pWindow.lock(); const auto NEWCHILD = PMASTER->pWindow.lock();
const bool IGNORE_IF_MASTER = vars.size() >= 2 && std::ranges::any_of(vars, [](const auto& e) { return e == "ignoremaster"; });
if (PMASTER->pWindow.lock() != PWINDOW) { if (PMASTER->pWindow.lock() != PWINDOW) {
const auto NEWMASTER = PWINDOW; const auto NEWMASTER = PWINDOW;
const bool newFocusToChild = vars.size() >= 2 && vars[1] == "child"; const bool newFocusToChild = vars.size() >= 2 && vars[1] == "child";
switchWindows(NEWMASTER, NEWCHILD); switchWindows(NEWMASTER, NEWCHILD);
const auto NEWFOCUS = newFocusToChild ? NEWCHILD : NEWMASTER; const auto NEWFOCUS = newFocusToChild ? NEWCHILD : NEWMASTER;
switchToWindow(NEWFOCUS); switchToWindow(NEWFOCUS);
} else { } else if (!IGNORE_IF_MASTER) {
for (auto const& n : m_masterNodesData) { for (auto const& n : m_masterNodesData) {
if (n.workspaceID == PMASTER->workspaceID && !n.isMaster) { if (n.workspaceID == PMASTER->workspaceID && !n.isMaster) {
const auto NEWMASTER = n.pWindow.lock(); const auto NEWMASTER = n.pWindow.lock();