Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-16 03:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Wrap raiseFocus to the lowest window from the root

Browse source
This commit is contained in:
outfoxxed 2023-06-11 17:00:39 -07:00
parent 7c29490cee
commit 3107efb73e
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Hy3Layout.cpp
View file

@ -1620,9 +1620,16 @@ void Hy3Layout::raiseFocus(int workspace) {
auto* node = this->getWorkspaceFocusedNode(workspace); auto* node = this->getWorkspaceFocusedNode(workspace);
if (node == nullptr) return; if (node == nullptr) return;
if (node->parent != nullptr && node->parent->parent != nullptr) { if (node->parent != nullptr) {
node->parent->focus(); node->parent->focus();
node->parent->updateDecos(); node->parent->updateDecos();
} else {
// trace focus as far as possible
while (node->data.type == Hy3NodeData::Group && node->data.as_group.focused_child != nullptr) {
node = node->data.as_group.focused_child;
}
node->focus();
} }
} }
@ -1697,7 +1704,7 @@ bool Hy3Layout::shouldRenderSelected(CWindow* window) {
if (focused == nullptr) return false; if (focused == nullptr) return false;
switch (focused->data.type) { switch (focused->data.type) {
case Hy3NodeData::Window: return false; case Hy3NodeData::Window: return focused->data.as_window == window;
case Hy3NodeData::Group: case Hy3NodeData::Group:
auto* node = this->getNodeFromWindow(window); auto* node = this->getNodeFromWindow(window);
if (node == nullptr) return false; if (node == nullptr) return false;