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

Refactor and deduplicate recursive group distruction

Browse source
This commit is contained in:
outfoxxed 2023-04-22 04:19:34 -07:00
parent b20b3f7402
commit 8a12cb4b64
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 51 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
src/Hy3Layout.cpp
View file

@ -213,6 +213,51 @@ bool swallowGroup(Hy3Node* into) {
return true;
}
Hy3Node* removeFromParentRecursive(Hy3Node* node) {
Hy3Node* parent = node;
Debug::log(LOG, "Recursively removing parent nodes of %p", node);
while (parent->parent != nullptr) {
auto* child = parent;
parent = parent->parent;
auto& group = parent->data.as_group;
if (group.children.size() > 2) {
auto iter = std::find(group.children.begin(), group.children.end(), child);
if (iter == group.children.begin()) {
group.lastFocusedChild = *std::next(iter);
} else {
group.lastFocusedChild = *std::prev(iter);
}
}
group.children.remove(child);
if (group.children.size() == 1) {
group.lastFocusedChild = group.children.front();
}
if (child != node) {
parent->layout->nodes.remove(*child);
}
if (!group.children.empty()) {
auto splitmod = group.children.empty() ? 0.0 : -((1.0 - child->size_ratio) / group.children.size());
for (auto* child: group.children) {
child->size_ratio += splitmod;
}
break;
}
}
return parent;
}
bool Hy3GroupData::hasChild(Hy3Node* node) {
Debug::log(LOG, "Searching for child %p of %p", this, node);
for (auto child: this->children) {
@ -471,59 +516,9 @@ void Hy3Layout::onWindowRemovedTiling(CWindow* window) {
g_pCompositor->setWindowFullscreen(window, false, FULLSCREEN_FULL);
}
auto* parent = node->parent;
auto* group = &parent->data.as_group;
if (group->children.size() > 2) {
auto iter = std::find(group->children.begin(), group->children.end(), node);
if (iter == group->children.begin()) {
group->lastFocusedChild = *std::next(iter);
} else {
group->lastFocusedChild = *std::prev(iter);
}
}
group->children.remove(node);
auto splitmod = group->children.empty() ? 0.0 : (1.0 - node->size_ratio) / group->children.size();
for (auto child: group->children) {
child->size_ratio -= splitmod;
}
auto* parent = removeFromParentRecursive(node);
this->nodes.remove(*node);
if (group->children.size() == 1) {
group->lastFocusedChild = group->children.front();
}
while (parent->parent != nullptr && group->children.empty()) {
auto* child = parent;
parent = parent->parent;
group = &parent->data.as_group;
if (group->children.size() > 2) {
auto iter = std::find(group->children.begin(), group->children.end(), child);
if (iter == group->children.begin()) {
group->lastFocusedChild = *std::next(iter);
} else {
group->lastFocusedChild = *std::prev(iter);
}
}
group->children.remove(child);
auto splitmod = group->children.empty() ? 0.0 : (1.0 - child->size_ratio) / group->children.size();
for (auto child: group->children) {
child->size_ratio -= splitmod;
}
this->nodes.remove(*child);
if (group->children.size() == 1) {
group->lastFocusedChild = group->children.front();
}
}
if (parent != nullptr) {
parent->recalcSizePosRecursive();
@ -1124,63 +1119,13 @@ Hy3Node* shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, bool shift) {
target_group->data.as_group.children.remove(nullptr);
target_group->recalcSizePosRecursive();
} else {
auto* old_parent = node.parent;
auto* old_group = &old_parent->data.as_group;
if (old_group->children.size() > 2) {
auto iter = std::find(old_group->children.begin(), old_group->children.end(), &node);
if (iter == old_group->children.begin()) {
old_group->lastFocusedChild = *std::next(iter);
} else {
old_group->lastFocusedChild = *std::prev(iter);
}
}
node.parent = target_group;
target_group->data.as_group.children.insert(insert, &node);
// must happen AFTER `insert` is used
old_group->children.remove(&node);
auto splitmod = old_group->children.empty() ? 0.0 : (1.0 - node.size_ratio) / old_group->children.size();
for (auto child: old_group->children) {
child->size_ratio -= splitmod;
}
auto* old_parent = removeFromParentRecursive(&node);
node.parent = target_group;
node.size_ratio = 1.0;
if (old_group->children.empty()) {
while (old_parent->parent != nullptr && old_parent->data.as_group.children.empty()) {
auto* child = old_parent;
old_parent = old_parent->parent;
old_group = &old_parent->data.as_group;
if (old_group->children.size() > 2) {
auto iter = std::find(old_group->children.begin(), old_group->children.end(), child);
if (iter == old_group->children.begin()) {
old_group->lastFocusedChild = *std::next(iter);
} else {
old_group->lastFocusedChild = *std::prev(iter);
}
}
old_parent->data.as_group.children.remove(child);
if (old_group->children.size() == 1) {
old_group->lastFocusedChild = old_group->children.front();
}
old_parent->layout->nodes.remove(*child);
auto splitmod = old_group->children.empty() ? 0.0 : (1.0 - child->size_ratio) / old_group->children.size();
for (auto child: old_group->children) {
child->size_ratio -= splitmod;
}
}
} else if (old_group->children.size() == 1) {
old_group->lastFocusedChild = old_group->children.front();
}
old_parent->recalcSizePosRecursive();
target_group->recalcSizePosRecursive();

4
src/Hy3Layout.hpp
View file

@ -81,7 +81,9 @@ struct Hy3Node {
// Attempt to swallow a group. returns true if swallowed
Hy3Node* swallowGroups(Hy3Node*);
// Remove this node from its parent, deleting the parent if it was
// the only child and recursing if the parent was the only child of it's parent.
Hy3Node* removeFromParentRecursive(Hy3Node*);
class Hy3Layout: public IHyprLayout {
public: