RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 01:37:35 +00:00
Code Issues Activity Actions

LibGUI+WindowServer: Remove InputPreemptor concept

Browse source 
This functionality will be superceded by WindowType:Popups
This commit is contained in:
thankyouverycool 2022-11-17 09:06:41 -05:00 • committed by Andreas Kling
parent 5d567565a4
commit 3027cf7e99
13 changed files with 0 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Services/WindowServer/MenuManager.cpp
View file

@ -355,16 +355,6 @@ void MenuManager::set_current_menu(Menu* menu)
}
m_current_menu = menu;
auto& wm = WindowManager::the();
if (auto* window = wm.active_input_window()) {
InputPreemptor preemptor { InputPreemptor::OtherMenu };
if (window->rect().contains(m_current_menu->unadjusted_position()))
preemptor = InputPreemptor::ContextMenu;
else if (!m_current_menu->rect_in_window_menubar().is_null())
preemptor = InputPreemptor::MenubarMenu;
wm.notify_input_preempted(*window, preemptor);
}
}
Menu* MenuManager::previous_menu(Menu* current)

1
Userland/Services/WindowServer/WindowClient.ipc
View file

@ -20,7 +20,6 @@ endpoint WindowClient
window_activated(i32 window_id) =|
window_deactivated(i32 window_id) =|
window_state_changed(i32 window_id, bool minimized, bool maximized, bool occluded) =|
window_input_preempted(i32 window_id, i32 preemptor) =|
window_close_request(i32 window_id) =|
window_resized(i32 window_id, Gfx::IntRect new_rect) =|
window_moved(i32 window_id, Gfx::IntRect new_rect) =|

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

@ -642,12 +642,6 @@ void WindowManager::notify_progress_changed(Window& window)
tell_wms_window_state_changed(window);
}
void WindowManager::notify_input_preempted(Window& window, InputPreemptor preemptor)
{
if (window.client())
window.client()->async_window_input_preempted(window.window_id(), (i32)preemptor);
}
void WindowManager::pick_new_active_window(Window* previous_active)
{
Window* desktop = nullptr;

1
Userland/Services/WindowServer/WindowManager.h
View file

@ -76,7 +76,6 @@ public:
void notify_occlusion_state_changed(Window&);
void notify_progress_changed(Window&);
void notify_modified_changed(Window&);
void notify_input_preempted(Window&, InputPreemptor = InputPreemptor::Other);
Gfx::IntRect tiled_window_rect(Window const&, WindowTileType tile_type = WindowTileType::Maximized, bool relative_to_window_screen = false) const;

9
Userland/Services/WindowServer/WindowMode.h
View file

@ -24,13 +24,4 @@ enum class WindowMode {
_Count,
};
// InputPreemptors are Objects which take input precedence over the active input
// window without changing its activity state or joining its modal chain
enum class InputPreemptor {
ContextMenu = 0,
MenubarMenu,
OtherMenu,
Other,
};
}