hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

keybinds: Add an option to pass a window argument to moveoutofgroup (#4724)

Browse source 
* keybinds: allow passing window to moveoutofgroup

* keybinds: cleaner handling of certain args
This commit is contained in:
Federico Maria Morrone 2024-02-17 23:44:22 +01:00 committed by GitHub
parent 289d952a6e
commit 5261a8df81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/managers/KeybindManager.cpp
View file

@ -797,7 +797,7 @@ void CKeybindManager::clearKeybinds() {
void CKeybindManager::toggleActiveFloating(std::string args) { void CKeybindManager::toggleActiveFloating(std::string args) {
CWindow* PWINDOW = nullptr; CWindow* PWINDOW = nullptr;
if (args != "" && args != "active" && args.length() > 1) if (args != "active" && args.length() > 1)
PWINDOW = g_pCompositor->getWindowByRegex(args); PWINDOW = g_pCompositor->getWindowByRegex(args);
else else
PWINDOW = g_pCompositor->m_pLastWindow; PWINDOW = g_pCompositor->m_pLastWindow;
@ -1941,7 +1941,7 @@ void CKeybindManager::pinActive(std::string args) {
CWindow* PWINDOW = nullptr; CWindow* PWINDOW = nullptr;
if (args != "" && args != "active" && args.length() > 1) if (args != "active" && args.length() > 1)
PWINDOW = g_pCompositor->getWindowByRegex(args); PWINDOW = g_pCompositor->getWindowByRegex(args);
else else
PWINDOW = g_pCompositor->m_pLastWindow; PWINDOW = g_pCompositor->m_pLastWindow;
@ -2180,7 +2180,12 @@ void CKeybindManager::moveOutOfGroup(std::string args) {
if (!*PIGNOREGROUPLOCK && g_pKeybindManager->m_bGroupsLocked) if (!*PIGNOREGROUPLOCK && g_pKeybindManager->m_bGroupsLocked)
return; return;
const auto PWINDOW = g_pCompositor->m_pLastWindow; CWindow* PWINDOW = nullptr;
if (args != "active" && args.length() > 1)
PWINDOW = g_pCompositor->getWindowByRegex(args);
else
PWINDOW = g_pCompositor->m_pLastWindow;
if (!PWINDOW || !PWINDOW->m_sGroupData.pNextWindow) if (!PWINDOW || !PWINDOW->m_sGroupData.pNextWindow)
return; return;