RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-24 06:05:08 +00:00
Code Issues Activity Actions

WindowServer: Fix traversing modal stack

Browse source 
When walking the modal window stack upwards, we need to check if
the top modal window is still a descendant of the window that
the parent is blocked by. Fixes not all windows being brought to
the front when trying to active a parent in the middle of the
modal window stack.
This commit is contained in:
Tom 2020-07-16 09:39:52 -06:00 • committed by Andreas Kling
parent e50874621a
commit 603c17262c
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Services/WindowServer/Window.cpp
View file

@ -634,4 +634,17 @@ void Window::set_progress(int progress)
WindowManager::the().notify_progress_changed(*this); WindowManager::the().notify_progress_changed(*this);
} }
bool Window::is_descendant_of(Window& window) const
{
for (auto* parent = parent_window(); parent; parent = parent->parent_window()) {
if (parent == &window)
return true;
for (auto& accessory : parent->accessory_windows()) {
if (accessory == &window)
return true;
}
}
return false;
}
} }

2
Services/WindowServer/Window.h
View file

@ -244,6 +244,8 @@ public:
Vector<WeakPtr<Window>>& accessory_windows() { return m_accessory_windows; } Vector<WeakPtr<Window>>& accessory_windows() { return m_accessory_windows; }
const Vector<WeakPtr<Window>>& accessory_windows() const { return m_accessory_windows; } const Vector<WeakPtr<Window>>& accessory_windows() const { return m_accessory_windows; }
bool is_descendant_of(Window&) const;
void set_accessory(bool accessory) { m_accessory = accessory; } void set_accessory(bool accessory) { m_accessory = accessory; }
bool is_accessory() const; bool is_accessory() const;
bool is_accessory_of(Window&) const; bool is_accessory_of(Window&) const;

3
Services/WindowServer/WindowManager.h
View file

@ -193,7 +193,8 @@ public:
Vector<Window*> modal_stack; Vector<Window*> modal_stack;
auto* modal_stack_top = blocking_modal_window ? blocking_modal_window : &window; auto* modal_stack_top = blocking_modal_window ? blocking_modal_window : &window;
for (auto* parent = modal_stack_top->parent_window(); parent; parent = parent->parent_window()) { for (auto* parent = modal_stack_top->parent_window(); parent; parent = parent->parent_window()) {
if (parent->is_blocked_by_modal_window() != modal_stack_top) auto* blocked_by = parent->is_blocked_by_modal_window();
if (!blocked_by || (blocked_by != modal_stack_top && !modal_stack_top->is_descendant_of(*blocked_by)))
break; break;
modal_stack.append(parent); modal_stack.append(parent);
if (!parent->is_modal()) if (!parent->is_modal())