Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-15 18:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix hy3 dispatchers in named workspaces

Browse source
This commit is contained in:
outfoxxed 2023-06-04 14:09:47 -07:00
parent 751a4c7568
commit d892bb6db7
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.cpp
View file

@ -29,7 +29,7 @@ int workspace_for_action() {
int workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
if (workspace_id < 0) return -1;
if (workspace_id == -1) return -1;
auto* workspace = g_pCompositor->getWorkspaceByID(workspace_id);
if (workspace == nullptr) return -1;
if (workspace->m_bHasFullscreenWindow) return -1;
@ -39,7 +39,7 @@ int workspace_for_action() {
void dispatch_makegroup(std::string arg) {
int workspace = workspace_for_action();
if (workspace < 0) return;
if (workspace == -1) return;
if (arg == "h") {
g_Hy3Layout->makeGroupOnWorkspace(workspace, Hy3GroupLayout::SplitH);
@ -60,7 +60,7 @@ std::optional<ShiftDirection> parseShiftArg(std::string arg) {
void dispatch_movewindow(std::string value) {
int workspace = workspace_for_action();
if (workspace < 0) return;
if (workspace == -1) return;
auto args = CVarList(value);
@ -72,7 +72,7 @@ void dispatch_movewindow(std::string value) {
void dispatch_movefocus(std::string arg) {
int workspace = workspace_for_action();
if (workspace < 0) return;
if (workspace == -1) return;
if (auto shift = parseShiftArg(arg)) {
g_Hy3Layout->shiftFocus(workspace, shift.value());
@ -81,17 +81,17 @@ void dispatch_movefocus(std::string arg) {
void dispatch_raisefocus(std::string arg) {
int workspace = workspace_for_action();
if (workspace < 0) return;
if (workspace == -1) return;
g_Hy3Layout->raiseFocus(workspace);
}
void dispatch_debug(std::string arg) {
int workspace = workspace_for_action();
if (workspace < 0) return;
if (workspace == -1) return;
auto* root = g_Hy3Layout->getWorkspaceRootGroup(workspace);
if (workspace < 0) {
if (workspace == -1) {
Debug::log(LOG, "DEBUG NODES: no nodes on workspace");
} else {
Debug::log(LOG, "DEBUG NODES\n%s", root->debugNode().c_str());