mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-08 21:25:59 +01:00
unify monitor args
This commit is contained in:
parent
56203b1757
commit
f5697095bc
1 changed files with 2 additions and 25 deletions
|
@ -1138,18 +1138,7 @@ void CKeybindManager::exitHyprland(std::string argz) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CKeybindManager::moveCurrentWorkspaceToMonitor(std::string args) {
|
void CKeybindManager::moveCurrentWorkspaceToMonitor(std::string args) {
|
||||||
CMonitor* PMONITOR = nullptr;
|
CMonitor* PMONITOR = g_pCompositor->getMonitorFromString(args);
|
||||||
|
|
||||||
try {
|
|
||||||
if (!isNumber(args) && !isDirection(args)) {
|
|
||||||
PMONITOR = g_pCompositor->getMonitorFromName(args);
|
|
||||||
} else {
|
|
||||||
PMONITOR = isDirection(args) ? g_pCompositor->getMonitorInDirection(args[0]) : g_pCompositor->getMonitorFromID(std::stoi(args));
|
|
||||||
}
|
|
||||||
} catch (std::exception& e) {
|
|
||||||
Debug::log(LOG, "moveCurrentWorkspaceToMonitor: caught exception in monitor", e.what());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!PMONITOR)
|
if (!PMONITOR)
|
||||||
return;
|
return;
|
||||||
|
@ -1170,19 +1159,7 @@ void CKeybindManager::moveWorkspaceToMonitor(std::string args) {
|
||||||
std::string workspace = args.substr(0, args.find_first_of(' '));
|
std::string workspace = args.substr(0, args.find_first_of(' '));
|
||||||
std::string monitor = args.substr(args.find_first_of(' ') + 1);
|
std::string monitor = args.substr(args.find_first_of(' ') + 1);
|
||||||
|
|
||||||
CMonitor* PMONITOR = nullptr;
|
const auto PMONITOR = g_pCompositor->getMonitorFromString(monitor);
|
||||||
|
|
||||||
try {
|
|
||||||
if (!isNumber(monitor) && !isDirection(monitor)) {
|
|
||||||
PMONITOR = g_pCompositor->getMonitorFromName(monitor);
|
|
||||||
} else {
|
|
||||||
PMONITOR = isDirection(monitor) ? g_pCompositor->getMonitorInDirection(monitor[0]) : g_pCompositor->getMonitorFromID(std::stoi(monitor));
|
|
||||||
}
|
|
||||||
} catch (std::exception& e) {
|
|
||||||
Debug::log(LOG, "moveWorkspaceToMonitor: caught exception in monitor", e.what());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (!PMONITOR){
|
if (!PMONITOR){
|
||||||
Debug::log(ERR, "Ignoring moveWorkspaceToMonitor: monitor doesnt exist");
|
Debug::log(ERR, "Ignoring moveWorkspaceToMonitor: monitor doesnt exist");
|
||||||
|
|
Loading…
Reference in a new issue