Diff
1diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
2index 0b93b4cfb2bb3f84456403658e7bafda888d953f..fd5e6b96247d47671cf40d9f12ae72ec83e9ec28 100644
3--- a/src/Hy3Layout.cpp
4+++ b/src/Hy3Layout.cpp
5@@ -746,10 +746,7 @@ void Hy3Layout::makeOppositeGroupOnWorkspace(int workspace, GroupEphemeralityOpt
6 this->makeOppositeGroupOn(node, ephemeral);
7 }
8
9-void Hy3Layout::changeGroupOnWorkspace(
10- int workspace,
11- Hy3GroupLayout layout
12-) {
13+void Hy3Layout::changeGroupOnWorkspace(int workspace, Hy3GroupLayout layout) {
14 auto* node = this->getWorkspaceFocusedNode(workspace);
15
16 if (node == nullptr) return;
17@@ -801,10 +798,7 @@ void Hy3Layout::makeGroupOn(
18 node->intoGroup(layout, ephemeral);
19 }
20
21-void Hy3Layout::makeOppositeGroupOn(
22- Hy3Node* node,
23- GroupEphemeralityOption ephemeral
24-) {
25+void Hy3Layout::makeOppositeGroupOn(Hy3Node* node, GroupEphemeralityOption ephemeral) {
26 if (node == nullptr) return;
27
28 if (node->parent == nullptr) {
29@@ -814,7 +808,7 @@ void Hy3Layout::makeOppositeGroupOn(
30
31 auto& group = node->parent->data.as_group;
32 auto layout
33- = group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH;
34+ = group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH;
35
36 if (group.children.size() == 1) {
37 group.setLayout(layout);
38@@ -826,10 +820,7 @@ void Hy3Layout::makeOppositeGroupOn(
39 node->intoGroup(layout, ephemeral);
40 }
41
42-void Hy3Layout::changeGroupOn(
43- Hy3Node& node,
44- Hy3GroupLayout layout
45-) {
46+void Hy3Layout::changeGroupOn(Hy3Node& node, Hy3GroupLayout layout) {
47 if (node.parent == nullptr) {
48 makeGroupOn(&node, layout, GroupEphemeralityOption::Ephemeral);
49 return;
50@@ -855,7 +846,9 @@ void Hy3Layout::changeGroupToOppositeOn(Hy3Node& node) {
51 auto& group = node.parent->data.as_group;
52
53 if (group.layout == Hy3GroupLayout::Tabbed) return;
54- group.setLayout(group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH);
55+ group.setLayout(
56+ group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH
57+ );
58 node.parent->recalcSizePosRecursive();
59 }
60
61@@ -863,7 +856,9 @@ void Hy3Layout::changeGroupEphemeralityOn(Hy3Node& node, bool ephemeral) {
62 if (node.parent == nullptr) return;
63
64 auto& group = node.parent->data.as_group;
65- group.setEphemeral(ephemeral ? GroupEphemeralityOption::ForceEphemeral : GroupEphemeralityOption::Standard);
66+ group.setEphemeral(
67+ ephemeral ? GroupEphemeralityOption::ForceEphemeral : GroupEphemeralityOption::Standard
68+ );
69 }
70
71 void Hy3Layout::shiftWindow(int workspace, ShiftDirection direction, bool once) {
72@@ -1497,7 +1492,9 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(
73 if (group.layout != Hy3GroupLayout::Tabbed && group.children.size() == 2
74 && std::find(group.children.begin(), group.children.end(), &node) != group.children.end())
75 {
76- group.setLayout(shiftIsVertical(direction) ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH);
77+ group.setLayout(
78+ shiftIsVertical(direction) ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH
79+ );
80 } else {
81 // wrap the root group in another group
82 this->nodes.push_back({
83diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
84index d6afc3ac49ad73f6b4c1ad0a1de946bb142ff368..8ff9fa442858b74359567618ef9130fb960e7609 100644
85--- a/src/Hy3Node.cpp
86+++ b/src/Hy3Node.cpp
87@@ -57,9 +57,7 @@ void Hy3GroupData::collapseExpansions() {
88 }
89 }
90
91-void Hy3GroupData::setLayout(
92- Hy3GroupLayout layout
93-) {
94+void Hy3GroupData::setLayout(Hy3GroupLayout layout) {
95 this->layout = layout;
96
97 if (layout != Hy3GroupLayout::Tabbed) {
98@@ -69,15 +67,11 @@ void Hy3GroupData::setLayout(
99
100 void Hy3GroupData::setEphemeral(GroupEphemeralityOption ephemeral) {
101 switch (ephemeral) {
102- case GroupEphemeralityOption::Standard:
103- this->ephemeral = false;
104- break;
105- case GroupEphemeralityOption::ForceEphemeral:
106- this->ephemeral = true;
107- break;
108- case GroupEphemeralityOption::Ephemeral:
109- // no change
110- break;
111+ case GroupEphemeralityOption::Standard: this->ephemeral = false; break;
112+ case GroupEphemeralityOption::ForceEphemeral: this->ephemeral = true; break;
113+ case GroupEphemeralityOption::Ephemeral:
114+ // no change
115+ break;
116 }
117 }
118
119diff --git a/src/dispatchers.cpp b/src/dispatchers.cpp
120index bec72aa63a25549d7ed88a6495b07909e8502a69..3250ee074734bb5c08ababbbf09ff3a21d50a6eb 100644
121--- a/src/dispatchers.cpp
122+++ b/src/dispatchers.cpp
123@@ -73,7 +73,6 @@ void dispatch_changeephemerality(std::string value) {
124 g_Hy3Layout->changeGroupEphemeralityOnWorkspace(workspace, ephemeral);
125 }
126
127-
128 std::optional<ShiftDirection> parseShiftArg(std::string arg) {
129 if (arg == "l" || arg == "left") return ShiftDirection::Left;
130 else if (arg == "r" || arg == "right") return ShiftDirection::Right;