hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2026-05-08 09:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

dispatcher(moveoutofgroup): optional direction arg

Browse source
This commit is contained in:
littleblack111 2026-02-22 17:35:11 +08:00
parent 0eb4755a3e
commit 9d72e3b063
No known key found for this signature in database
GPG key ID: 45AE0FF5962FA6EF
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/managers/KeybindManager.cpp
View file

@ -2749,6 +2749,12 @@ void CKeybindManager::moveWindowOutOfGroup(PHLWINDOW pWindow, const std::string&
group->current()->warpCursor();
}
if (!dir.empty()) {
Math::eDirection direction = Math::fromChar(dir[0]);
if (direction != Math::DIRECTION_DEFAULT)
g_layoutManager->moveInDirection(pWindow->layoutTarget(), dir);
}
g_pEventManager->postEvent(SHyprIPCEvent{"moveoutofgroup", std::format("{:x}", rc<uintptr_t>(pWindow.get()))});
}
@ -2791,12 +2797,23 @@ SDispatchResult CKeybindManager::moveOutOfGroup(std::string args) {
if (!*PIGNOREGROUPLOCK && g_pKeybindManager->m_groupsLocked)
return {.success = false, .error = "Groups locked"};
PHLWINDOW PWINDOW = nullptr;
PHLWINDOW PWINDOW = nullptr;
std::string dir;
if (args != "active" && args.length() > 1)
PWINDOW = g_pCompositor->getWindowByRegex(args);
else
if (args.empty() || args == "active")
PWINDOW = Desktop::focusState()->window();
else if (args.length() == 1 && std::string("lrutdb").find(args[0]) != std::string::npos) {
PWINDOW = Desktop::focusState()->window();
dir = args;
} else {
size_t spacePos = args.find_last_of(' ');
if (spacePos != std::string::npos && std::string("lrutdb").find(args.back()) != std::string::npos) {
std::string windowRegex = args.substr(0, spacePos);
PWINDOW = g_pCompositor->getWindowByRegex(windowRegex);
dir = args.substr(spacePos + 1);
} else
PWINDOW = g_pCompositor->getWindowByRegex(args);
}
if (!PWINDOW)
return {.success = false, .error = "No window found"};
@ -2804,7 +2821,7 @@ SDispatchResult CKeybindManager::moveOutOfGroup(std::string args) {
if (!PWINDOW->m_group)
return {.success = false, .error = "Window not in a group"};
moveWindowOutOfGroup(PWINDOW);
moveWindowOutOfGroup(PWINDOW, dir);
return {};
}