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

Allow window shifting to break the root group

Browse source 
Allow window shifting to break out of the root group by wrapping it in
a new root group and breaking from the old one.

Also fix not being able to shift windows into the root group from
nested groups.
This commit is contained in:
outfoxxed 2023-04-24 02:58:53 -07:00
parent 7a61abddb9
commit 49ae28631f
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Hy3Layout.cpp
View file

@ -199,13 +199,15 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
bool Hy3Node::swallowGroups(Hy3Node* into) {
if (into == nullptr
|| into->parent == nullptr
|| into->data.type != Hy3NodeData::Group
|| into->data.as_group.children.size() != 1)
return false;
auto* child = into->data.as_group.children.front();
// a lot of segfaulting happens once the assumption that the root node is a group is wrong.
if (into->parent == nullptr && child->data.type != Hy3NodeData::Group) return false;
Debug::log(LOG, "Swallowing %p into %p", child, into);
Hy3Node::swapData(*into, *child);
into->layout->nodes.remove(*child);
@ -961,7 +963,7 @@ void Hy3Layout::shiftFocus(CWindow* window, ShiftDirection direction) {
if (node == nullptr) return;
Hy3Node* target;
if ((target = Hy3Layout::shiftOrGetFocus(*node, direction, false))) {
if ((target = this->shiftOrGetFocus(*node, direction, false))) {
g_pCompositor->focusWindow(target->data.as_window);
}
}
@ -972,7 +974,7 @@ void Hy3Layout::shiftWindow(CWindow* window, ShiftDirection direction) {
if (node == nullptr) return;
Hy3Layout::shiftOrGetFocus(*node, direction, true);
this->shiftOrGetFocus(*node, direction, true);
}
bool shiftIsForward(ShiftDirection direction) {
@ -1009,7 +1011,28 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, boo
}
if (break_parent->parent == nullptr) {
return nullptr;
if (!shift) return nullptr;
// if we haven't gone up any levels and the group is in the same direction
// there's no reason to wrap the root group.
if (shiftMatchesLayout(group.layout, direction)) break;
// wrap the root group in another group
this->nodes.push_back({
.parent = break_parent,
.data = shiftIsVertical(direction) ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH,
.position = break_parent->position,
.size = break_parent->size,
.workspace_id = break_parent->workspace_id,
.layout = this,
});
auto* newChild = &this->nodes.back();
Hy3Node::swapData(*break_parent, *newChild);
break_parent->data.as_group.children.push_back(newChild);
break_parent->data.as_group.lastFocusedChild = newChild;
break_origin = newChild;
break;
} else {
break_origin = break_parent;
break_parent = break_origin->parent;

2
src/Hy3Layout.hpp
View file

@ -125,7 +125,7 @@ private:
// if shift is true, shift the window in the given direction, returning nullptr,
// if shift is false, return the window in the given direction or nullptr.
static Hy3Node* shiftOrGetFocus(Hy3Node&, ShiftDirection, bool);
Hy3Node* shiftOrGetFocus(Hy3Node&, ShiftDirection, bool);
friend struct Hy3Node;
};