hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2026-05-07 23:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

swallowing: fix unwanted reswallow when process opens a secondary window

Browse source
This commit is contained in:
Tom Benham 2026-01-15 11:43:44 +01:00
parent 8884b9e6ce
commit fb644d12e3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/desktop/view/Window.cpp
View file

@ -2090,9 +2090,12 @@ void CWindow::mapWindow() {
// Verify window swallowing. Get the swallower before calling onWindowCreated(m_self.lock()) because getSwallower() wouldn't get it after if m_self.lock() gets auto grouped.
const auto SWALLOWER = getSwallower();
m_swallowed = SWALLOWER;
if (m_swallowed)
m_swallowed->m_currentlySwallowed = true;
// m_hasSwallower prevents secondary windows to swallow the parent when it's been unswallowed with `toggleswallow`.
if (SWALLOWER && !SWALLOWER->m_hasSwallower) {
SWALLOWER->m_currentlySwallowed = true;
SWALLOWER->m_hasSwallower = true;
m_swallowed = SWALLOWER;
}
// emit the IPC event before the layout might focus the window to avoid a focus event first
g_pEventManager->postEvent(SHyprIPCEvent{"openwindow", std::format("{:x},{},{},{}", m_self.lock(), PWORKSPACE->m_name, m_class, m_title)});
@ -2223,7 +2226,7 @@ void CWindow::mapWindow() {
}
// swallow
if (SWALLOWER) {
if (m_swallowed) {
g_layoutManager->removeTarget(SWALLOWER->layoutTarget());
SWALLOWER->setHidden(true);
}
@ -2321,6 +2324,7 @@ void CWindow::unmapWindow() {
}
m_swallowed->m_groupSwallowed = false;
m_swallowed->m_hasSwallower = false;
m_swallowed.reset();
}

1
src/desktop/view/Window.hpp
View file

@ -260,6 +260,7 @@ namespace Desktop::View {
PHLWINDOWREF m_swallowed;
bool m_currentlySwallowed = false;
bool m_groupSwallowed = false;
bool m_hasSwallower = false;
// for toplevel monitor events
MONITORID m_lastSurfaceMonitorID = -1;