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 wrong window selection on close

Browse source
This commit is contained in:
outfoxxed 2023-04-16 23:53:22 -07:00
parent e1fe28f39f
commit 0a0177d019
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Hy3Layout.cpp
View file

@ -416,6 +416,7 @@ void Hy3Layout::onWindowCreatedTiling(CWindow* window) {
} }
Debug::log(LOG, "open new window %p(node: %p:%p) on winodow %p in %p", window, &node, node.data.as_window, opening_after, opening_into); Debug::log(LOG, "open new window %p(node: %p:%p) on winodow %p in %p", window, &node, node.data.as_window, opening_after, opening_into);
opening_into->data.as_group.lastFocusedChild = &node;
opening_into->recalcSizePosRecursive(); opening_into->recalcSizePosRecursive();
Debug::log(LOG, "opening_into (%p) contains new child (%p)? %d", opening_into, &node, opening_into->data.as_group.hasChild(&node)); Debug::log(LOG, "opening_into (%p) contains new child (%p)? %d", opening_into, &node, opening_into->data.as_group.hasChild(&node));
} }
@ -440,9 +441,22 @@ void Hy3Layout::onWindowRemovedTiling(CWindow* window) {
auto* parent = node->parent; auto* parent = node->parent;
auto* group = &parent->data.as_group; 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); group->children.remove(node);
this->nodes.remove(*node); this->nodes.remove(*node);
if (group->children.size() == 1) {
group->lastFocusedChild = group->children.front();
}
while (parent->parent != nullptr && group->children.empty()) { while (parent->parent != nullptr && group->children.empty()) {
auto* child = parent; auto* child = parent;
parent = parent->parent; parent = parent->parent;
@ -457,23 +471,26 @@ void Hy3Layout::onWindowRemovedTiling(CWindow* window) {
} }
} }
parent->data.as_group.children.remove(child); group->children.remove(child);
this->nodes.remove(*child);
if (group->children.size() == 1) { if (group->children.size() == 1) {
group->lastFocusedChild = group->children.front(); group->lastFocusedChild = group->children.front();
} }
this->nodes.remove(*child);
} }
if (parent != nullptr) { if (parent != nullptr) {
parent->recalcSizePosRecursive(); parent->recalcSizePosRecursive();
auto* focus = group->lastFocusedChild;
while (focus->data.type == Hy3NodeData::Group) focus = focus->data.as_group.lastFocusedChild;
g_pCompositor->focusWindow(focus->data.as_window);
} }
} }
CWindow* Hy3Layout::getNextWindowCandidate(CWindow* window) {
auto* node = this->getWorkspaceRootGroup(window->m_iWorkspaceID);
if (node == nullptr) return nullptr;
while (node->data.type == Hy3NodeData::Group) node = node->data.as_group.lastFocusedChild;
return node->data.as_window;
}
void Hy3Layout::onWindowFocusChange(CWindow* window) { void Hy3Layout::onWindowFocusChange(CWindow* window) {
Debug::log(LOG, "Switched windows from %p to %p", this->lastActiveWindow, window); Debug::log(LOG, "Switched windows from %p to %p", this->lastActiveWindow, window);
auto* node = this->getNodeFromWindow(this->lastActiveWindow); auto* node = this->getNodeFromWindow(this->lastActiveWindow);

3
src/Hy3Layout.hpp
View file

@ -93,7 +93,8 @@ public:
virtual void switchWindows(CWindow*, CWindow*); virtual void switchWindows(CWindow*, CWindow*);
virtual void alterSplitRatio(CWindow*, float, bool); virtual void alterSplitRatio(CWindow*, float, bool);
virtual std::string getLayoutName(); virtual std::string getLayoutName();
virtual void replaceWindowDataWith(CWindow* from, CWindow* to); virtual CWindow* getNextWindowCandidate(CWindow*);
virtual void replaceWindowDataWith(CWindow*, CWindow*);
virtual void onEnable(); virtual void onEnable();
virtual void onDisable(); virtual void onDisable();