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

WindowServer: Correct invalidation rects for menu windows.

Browse source
This commit is contained in:
Andreas Kling 2019-02-19 15:46:48 +01:00
parent 98784ad3cb
commit b561a5976f
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WindowServer/WSWindowManager.cpp
View file

@ -24,6 +24,11 @@
static const int window_titlebar_height = 16; static const int window_titlebar_height = 16;
static inline Rect menu_window_rect(const Rect& rect)
{
return rect.inflated(2, 2);
}
static inline Rect title_bar_rect(const Rect& window) static inline Rect title_bar_rect(const Rect& window)
{ {
return { return {
@ -303,7 +308,7 @@ void WSWindowManager::paint_window_frame(WSWindow& window)
//printf("[WM] paint_window_frame {%p}, rect: %d,%d %dx%d\n", &window, window.rect().x(), window.rect().y(), window.rect().width(), window.rect().height()); //printf("[WM] paint_window_frame {%p}, rect: %d,%d %dx%d\n", &window, window.rect().x(), window.rect().y(), window.rect().width(), window.rect().height());
if (window.type() == WSWindowType::Menu) { if (window.type() == WSWindowType::Menu) {
m_back_painter->draw_rect(window.rect().inflated(2, 2), Color::LightGray); m_back_painter->draw_rect(menu_window_rect(window.rect()), Color::LightGray);
return; return;
} }
@ -527,7 +532,7 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event)
return; return;
} }
if (m_current_menu) { if (m_current_menu && m_current_menu->menu_window()) {
bool event_is_inside_current_menu = m_current_menu->menu_window()->rect().contains(event.position()); bool event_is_inside_current_menu = m_current_menu->menu_window()->rect().contains(event.position());
if (!event_is_inside_current_menu) { if (!event_is_inside_current_menu) {
if (m_current_menu->hovered_item()) if (m_current_menu->hovered_item())
@ -818,7 +823,15 @@ void WSWindowManager::invalidate(const Rect& a_rect, bool should_schedule_compos
void WSWindowManager::invalidate(const WSWindow& window) void WSWindowManager::invalidate(const WSWindow& window)
{ {
invalidate(outer_window_rect(window.rect())); if (window.type() == WSWindowType::Menu) {
invalidate(menu_window_rect(window.rect()));
return;
}
if (window.type() == WSWindowType::Normal) {
invalidate(outer_window_rect(window.rect()));
return;
}
ASSERT_NOT_REACHED();
} }
void WSWindowManager::invalidate(const WSWindow& window, const Rect& rect) void WSWindowManager::invalidate(const WSWindow& window, const Rect& rect)