Fix hy3:killactive not killing floating windows

This commit is contained in:
outfoxxed 2023-06-25 21:10:53 -07:00
parent ee8c49357f
commit 9a3f635db3
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E

View file

@ -1867,15 +1867,19 @@ hastab:
}
void Hy3Layout::killFocusedNode(int workspace) {
auto* node = this->getWorkspaceFocusedNode(workspace);
if (node == nullptr) return;
if (g_pCompositor->m_pLastWindow != nullptr && g_pCompositor->m_pLastWindow->m_bIsFloating) {
g_pCompositor->closeWindow(g_pCompositor->m_pLastWindow);
} else {
auto* node = this->getWorkspaceFocusedNode(workspace);
if (node == nullptr) return;
std::vector<CWindow*> windows;
node->appendAllWindows(windows);
std::vector<CWindow*> windows;
node->appendAllWindows(windows);
for (auto* window: windows) {
window->setHidden(false);
g_pCompositor->closeWindow(window);
for (auto* window: windows) {
window->setHidden(false);
g_pCompositor->closeWindow(window);
}
}
}