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

run clang-format

Browse source
This commit is contained in:
Sekhat Temporus 2023-08-17 13:07:34 +01:00
parent 88267eee85
commit fc5da015ff
3 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Hy3Layout.cpp
View file

@ -746,10 +746,7 @@ void Hy3Layout::makeOppositeGroupOnWorkspace(int workspace, GroupEphemeralityOpt
this->makeOppositeGroupOn(node, ephemeral); this->makeOppositeGroupOn(node, ephemeral);
} }
void Hy3Layout::changeGroupOnWorkspace( void Hy3Layout::changeGroupOnWorkspace(int workspace, Hy3GroupLayout layout) {
int workspace,
Hy3GroupLayout layout
) {
auto* node = this->getWorkspaceFocusedNode(workspace); auto* node = this->getWorkspaceFocusedNode(workspace);
if (node == nullptr) return; if (node == nullptr) return;
@ -801,10 +798,7 @@ void Hy3Layout::makeGroupOn(
node->intoGroup(layout, ephemeral); node->intoGroup(layout, ephemeral);
} }
void Hy3Layout::makeOppositeGroupOn( void Hy3Layout::makeOppositeGroupOn(Hy3Node* node, GroupEphemeralityOption ephemeral) {
Hy3Node* node,
GroupEphemeralityOption ephemeral
) {
if (node == nullptr) return; if (node == nullptr) return;
if (node->parent == nullptr) { if (node->parent == nullptr) {
@ -814,7 +808,7 @@ void Hy3Layout::makeOppositeGroupOn(
auto& group = node->parent->data.as_group; auto& group = node->parent->data.as_group;
auto layout auto layout
= group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH; = group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH;
if (group.children.size() == 1) { if (group.children.size() == 1) {
group.setLayout(layout); group.setLayout(layout);
@ -826,10 +820,7 @@ void Hy3Layout::makeOppositeGroupOn(
node->intoGroup(layout, ephemeral); node->intoGroup(layout, ephemeral);
} }
void Hy3Layout::changeGroupOn( void Hy3Layout::changeGroupOn(Hy3Node& node, Hy3GroupLayout layout) {
Hy3Node& node,
Hy3GroupLayout layout
) {
if (node.parent == nullptr) { if (node.parent == nullptr) {
makeGroupOn(&node, layout, GroupEphemeralityOption::Ephemeral); makeGroupOn(&node, layout, GroupEphemeralityOption::Ephemeral);
return; return;
@ -855,7 +846,9 @@ void Hy3Layout::changeGroupToOppositeOn(Hy3Node& node) {
auto& group = node.parent->data.as_group; auto& group = node.parent->data.as_group;
if (group.layout == Hy3GroupLayout::Tabbed) return; if (group.layout == Hy3GroupLayout::Tabbed) return;
group.setLayout(group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH); group.setLayout(
group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH
);
node.parent->recalcSizePosRecursive(); node.parent->recalcSizePosRecursive();
} }
@ -863,7 +856,9 @@ void Hy3Layout::changeGroupEphemeralityOn(Hy3Node& node, bool ephemeral) {
if (node.parent == nullptr) return; if (node.parent == nullptr) return;
auto& group = node.parent->data.as_group; auto& group = node.parent->data.as_group;
group.setEphemeral(ephemeral ? GroupEphemeralityOption::ForceEphemeral : GroupEphemeralityOption::Standard); group.setEphemeral(
ephemeral ? GroupEphemeralityOption::ForceEphemeral : GroupEphemeralityOption::Standard
);
} }
void Hy3Layout::shiftWindow(int workspace, ShiftDirection direction, bool once) { void Hy3Layout::shiftWindow(int workspace, ShiftDirection direction, bool once) {
@ -1497,7 +1492,9 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(
if (group.layout != Hy3GroupLayout::Tabbed && group.children.size() == 2 if (group.layout != Hy3GroupLayout::Tabbed && group.children.size() == 2
&& std::find(group.children.begin(), group.children.end(), &node) != group.children.end()) && std::find(group.children.begin(), group.children.end(), &node) != group.children.end())
{ {
group.setLayout(shiftIsVertical(direction) ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH); group.setLayout(
shiftIsVertical(direction) ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH
);
} else { } else {
// wrap the root group in another group // wrap the root group in another group
this->nodes.push_back({ this->nodes.push_back({

18
src/Hy3Node.cpp
View file

@ -57,9 +57,7 @@ void Hy3GroupData::collapseExpansions() {
} }
} }
void Hy3GroupData::setLayout( void Hy3GroupData::setLayout(Hy3GroupLayout layout) {
Hy3GroupLayout layout
) {
this->layout = layout; this->layout = layout;
if (layout != Hy3GroupLayout::Tabbed) { if (layout != Hy3GroupLayout::Tabbed) {
@ -69,15 +67,11 @@ void Hy3GroupData::setLayout(
void Hy3GroupData::setEphemeral(GroupEphemeralityOption ephemeral) { void Hy3GroupData::setEphemeral(GroupEphemeralityOption ephemeral) {
switch (ephemeral) { switch (ephemeral) {
case GroupEphemeralityOption::Standard: case GroupEphemeralityOption::Standard: this->ephemeral = false; break;
this->ephemeral = false; case GroupEphemeralityOption::ForceEphemeral: this->ephemeral = true; break;
break; case GroupEphemeralityOption::Ephemeral:
case GroupEphemeralityOption::ForceEphemeral: // no change
this->ephemeral = true; break;
break;
case GroupEphemeralityOption::Ephemeral:
// no change
break;
} }
} }

1
src/dispatchers.cpp
View file

@ -73,7 +73,6 @@ void dispatch_changeephemerality(std::string value) {
g_Hy3Layout->changeGroupEphemeralityOnWorkspace(workspace, ephemeral); g_Hy3Layout->changeGroupEphemeralityOnWorkspace(workspace, ephemeral);
} }
std::optional<ShiftDirection> parseShiftArg(std::string arg) { std::optional<ShiftDirection> parseShiftArg(std::string arg) {
if (arg == "l" || arg == "left") return ShiftDirection::Left; if (arg == "l" || arg == "left") return ShiftDirection::Left;
else if (arg == "r" || arg == "right") return ShiftDirection::Right; else if (arg == "r" || arg == "right") return ShiftDirection::Right;