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 single group nested in a group bug

Browse source
This commit is contained in:
outfoxxed 2023-04-19 02:07:47 -07:00
parent 1121d0aa66
commit d5828c5878
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Hy3Layout.cpp
View file

@ -197,6 +197,18 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
} }
} }
bool swallowGroup(Hy3Node* into) {
if (into == nullptr || into->data.type != Hy3NodeData::Group) return false;
if (into->data.as_group.children.size() != 1) return false;
auto* child = into->data.as_group.children.front();
Debug::log(LOG, "Swallowing %p into %p", child, into);
swapNodeData(*into, *child);
into->layout->nodes.remove(*child);
return true;
}
bool Hy3GroupData::hasChild(Hy3Node* node) { bool Hy3GroupData::hasChild(Hy3Node* node) {
Debug::log(LOG, "Searching for child %p of %p", this, node); Debug::log(LOG, "Searching for child %p of %p", this, node);
for (auto child: this->children) { for (auto child: this->children) {
@ -1093,7 +1105,6 @@ Hy3Node* shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, bool shift) {
// must happen AFTER `insert` is used // must happen AFTER `insert` is used
old_group->children.remove(&node); old_group->children.remove(&node);
auto splitmod = old_group->children.empty() ? 0.0 : (1.0 - node.size_ratio) / old_group->children.size(); auto splitmod = old_group->children.empty() ? 0.0 : (1.0 - node.size_ratio) / old_group->children.size();
for (auto child: old_group->children) { for (auto child: old_group->children) {
child->size_ratio -= splitmod; child->size_ratio -= splitmod;
@ -1135,6 +1146,14 @@ Hy3Node* shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, bool shift) {
old_parent->recalcSizePosRecursive(); old_parent->recalcSizePosRecursive();
target_group->recalcSizePosRecursive(); target_group->recalcSizePosRecursive();
auto* target_parent = target_group->parent;
while (target_parent != nullptr && swallowGroup(target_parent)) {
target_parent = target_parent->parent;
}
if (target_parent != target_group && target_parent != nullptr)
target_parent->recalcSizePosRecursive();
} }
return nullptr; return nullptr;

4
src/Hy3Layout.hpp
View file

@ -79,6 +79,10 @@ struct Hy3Node {
bool operator==(const Hy3Node&) const; bool operator==(const Hy3Node&) const;
}; };
// Attempt to swallow a group. returns true if swallowed
Hy3Node* swallowGroups(Hy3Node*);
class Hy3Layout: public IHyprLayout { class Hy3Layout: public IHyprLayout {
public: public:
virtual void onWindowCreatedTiling(CWindow*); virtual void onWindowCreatedTiling(CWindow*);