RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:47:45 +00:00
Code Issues Activity Actions

WindowServer: Focus windows blocked by a modal window

Browse source 
If a window which has an active modal window is focused, the modal
window starts blinking. In this case, the window (and modal) should
still be focused. For this, the order of the checks in
process_mouse_event_for_window has to be changed.

This fixes #8183.
This commit is contained in:
Max Wipfli 2021-06-21 12:50:45 +02:00 • committed by Andreas Kling
parent f68932cac1
commit ac9003bb70
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -950,20 +950,11 @@ bool WindowManager::process_mouse_event_for_titlebar_buttons(MouseEvent const& e
void WindowManager::process_mouse_event_for_window(HitTestResult& result, MouseEvent const& event)
{
auto& window = *result.window;
if (auto* blocking_modal_window = window.blocking_modal_window()) {
if (event.type() == Event::Type::MouseDown) {
// We're clicking on something that's blocked by a modal window.
// Flash the modal window to let the user know about it.
blocking_modal_window->frame().start_flash_animation();
}
// Don't send mouse events to windows blocked by a modal child.
return;
}
auto* blocking_modal_window = window.blocking_modal_window();
// First check if we should initiate a move or resize (Super+LMB or Super+RMB).
// In those cases, the event is swallowed by the window manager.
if (window.is_movable()) {
if (!blocking_modal_window && window.is_movable()) {
if (!window.is_fullscreen() && m_keyboard_modifiers == Mod_Super && event.type() == Event::MouseDown && event.button() == MouseButton::Left) {
start_window_move(window, event);
return;
@ -981,6 +972,16 @@ void WindowManager::process_mouse_event_for_window(HitTestResult& result, MouseE
set_active_window(&window);
}
if (blocking_modal_window) {
if (event.type() == Event::Type::MouseDown) {
// We're clicking on something that's blocked by a modal window.
// Flash the modal window to let the user know about it.
blocking_modal_window->frame().start_flash_animation();
}
// Don't send mouse events to windows blocked by a modal child.
return;
}
if (result.is_frame_hit) {
// We are hitting the frame, pass the event along to WindowFrame.
window.frame().handle_mouse_event(event.translated(-window.frame().rect().location()));