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 window shifting with once moving into oppositely tiled groups

Browse source
This commit is contained in:
outfoxxed 2023-05-12 01:07:27 -07:00
parent 34846efb8f
commit face71676c
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Hy3Layout.cpp
View file

@ -1187,10 +1187,10 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, boo
if (!((!shiftIsForward(direction) && group.children.front() == break_origin)
|| (shiftIsForward(direction) && group.children.back() == break_origin)))
break;
} else {
has_broken_once = true;
}
has_broken_once = true;
if (break_parent->parent == nullptr) {
if (!shift) return nullptr;
@ -1198,7 +1198,10 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, boo
// there's no reason to wrap the root group.
if (shiftMatchesLayout(group.layout, direction)) break;
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()
) {
group.layout = shiftIsVertical(direction) ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH;
} else {
// wrap the root group in another group