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

WindowServer: Properly determine where a window may be

Browse source 
This also fixes weird behavior of WindowManager::desktop_rect().
None of the callers seem to ever expect an empty Rect, so return a non-empty Rect.
This commit is contained in:
Ben Wiederhake 2021-01-28 20:51:37 +01:00 • committed by Andreas Kling
parent af605afb27
commit 3fd5aec187
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1043,7 +1043,7 @@ Gfx::IntRect WindowManager::menubar_rect() const
Gfx::IntRect WindowManager::desktop_rect() const
{
if (active_fullscreen_window())
return {};
return Screen::the().rect();
return {
0,
menubar_rect().bottom() + 1,
@ -1052,6 +1052,25 @@ Gfx::IntRect WindowManager::desktop_rect() const
};
}
Gfx::IntRect WindowManager::arena_rect_for_type(WindowType type) const
{
switch (type) {
case WindowType::Desktop:
case WindowType::Normal:
return desktop_rect();
case WindowType::Menu:
case WindowType::WindowSwitcher:
case WindowType::Taskbar:
case WindowType::Tooltip:
case WindowType::Menubar:
case WindowType::MenuApplet:
case WindowType::Notification:
return Screen::the().rect();
default:
ASSERT_NOT_REACHED();
}
}
void WindowManager::event(Core::Event& event)
{
if (static_cast<Event&>(event).is_mouse_event()) {