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

WindowServer: More work on the menu system.

Browse source 
Menus are now tied to a Process (by WeakPtr.) This will allow us to pass
notifications to the correct event stream.
This commit is contained in:
Andreas Kling 2019-02-12 08:39:19 +01:00
parent 133706d697
commit 15b4c9f9f1
7 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
WindowServer/WSMenu.cpp
View file

@ -7,9 +7,10 @@
#include <SharedGraphics/Painter.h>
#include <SharedGraphics/Font.h>
WSMenu::WSMenu(int menu_id, String&& name)
WSMenu::WSMenu(Process& process, int menu_id, String&& name)
: m_menu_id(menu_id)
, m_name(move(name))
, m_process(process.make_weak_ptr())
{
}
@ -88,7 +89,7 @@ void WSMenu::draw()
if (item->type() == WSMenuItem::Text) {
Color text_color = Color::Black;
if (item.ptr() == m_hovered_item) {
painter.fill_rect(item->rect(), Color(0, 0, 104));
painter.fill_rect(item->rect(), WSWindowManager::the().menu_selection_color());
text_color = Color::White;
}
painter.draw_text(item->rect().translated(left_padding(), 0), item->text(), TextAlignment::CenterLeft, text_color);