mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 02:37:36 +00:00
WindowServer: More work on menus.
This commit is contained in:
parent
443b043b49
commit
5f288014d4
11 changed files with 51 additions and 33 deletions
|
@ -43,6 +43,13 @@ int WSMenu::height() const
|
|||
return (m_items.last()->rect().bottom() - 1) + padding();
|
||||
}
|
||||
|
||||
void WSMenu::redraw()
|
||||
{
|
||||
ASSERT(menu_window());
|
||||
draw();
|
||||
menu_window()->invalidate();
|
||||
}
|
||||
|
||||
WSWindow& WSMenu::ensure_menu_window()
|
||||
{
|
||||
if (!m_menu_window) {
|
||||
|
@ -59,21 +66,20 @@ WSWindow& WSMenu::ensure_menu_window()
|
|||
|
||||
auto window = make<WSWindow>(*this);
|
||||
window->set_rect(0, 0, width(), height());
|
||||
dbgprintf("Created menu window for menu '%s' (%u items) with rect %s\n", name().characters(), m_items.size(), window->rect().to_string().characters());
|
||||
m_menu_window = move(window);
|
||||
draw();
|
||||
}
|
||||
return *m_menu_window;
|
||||
}
|
||||
|
||||
|
||||
void WSMenu::draw()
|
||||
{
|
||||
ASSERT(m_menu_window);
|
||||
ASSERT(m_menu_window->backing());
|
||||
Painter painter(*m_menu_window->backing());
|
||||
|
||||
Rect rect { { }, m_menu_window->size() };
|
||||
ASSERT(menu_window());
|
||||
ASSERT(menu_window()->backing());
|
||||
Painter painter(*menu_window()->backing());
|
||||
|
||||
Rect rect { { }, menu_window()->size() };
|
||||
painter.draw_rect(rect, Color::White);
|
||||
painter.fill_rect(rect.shrunken(2, 2), Color::LightGray);
|
||||
|
||||
|
@ -81,10 +87,10 @@ 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, 128));
|
||||
painter.fill_rect(item->rect(), Color(0, 0, 104));
|
||||
text_color = Color::White;
|
||||
}
|
||||
painter.draw_text(item->rect(), item->text(), Painter::TextAlignment::CenterLeft, text_color);
|
||||
painter.draw_text(item->rect(), item->text(), TextAlignment::CenterLeft, text_color);
|
||||
} else if (item->type() == WSMenuItem::Separator) {
|
||||
Point p1(padding(), item->rect().center().y());
|
||||
Point p2(width() - padding(), item->rect().center().y());
|
||||
|
@ -95,17 +101,22 @@ void WSMenu::draw()
|
|||
|
||||
void WSMenu::on_window_message(WSMessage& message)
|
||||
{
|
||||
dbgprintf("WSMenu::on_window_message: %u\n", message.type());
|
||||
ASSERT(menu_window());
|
||||
if (message.type() == WSMessage::MouseMove) {
|
||||
auto& mouse_event = static_cast<WSMouseEvent&>(message);
|
||||
for (auto& item : m_items) {
|
||||
if (item->rect().contains(mouse_event.position())) {
|
||||
if (m_hovered_item == item.ptr())
|
||||
return;
|
||||
m_hovered_item = item.ptr();
|
||||
draw();
|
||||
menu_window()->invalidate();
|
||||
}
|
||||
}
|
||||
auto* item = item_at(static_cast<WSMouseEvent&>(message).position());
|
||||
if (!item || m_hovered_item == item)
|
||||
return;
|
||||
m_hovered_item = item;
|
||||
redraw();
|
||||
}
|
||||
}
|
||||
|
||||
WSMenuItem* WSMenu::item_at(const Point& position)
|
||||
{
|
||||
for (auto& item : m_items) {
|
||||
if (!item->rect().contains(position))
|
||||
continue;
|
||||
return item.ptr();
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
|
|
@ -54,6 +54,9 @@ public:
|
|||
void draw();
|
||||
const Font& font() const;
|
||||
|
||||
WSMenuItem* item_at(const Point&);
|
||||
void redraw();
|
||||
|
||||
private:
|
||||
String m_name;
|
||||
Rect m_rect_in_menubar;
|
||||
|
|
|
@ -302,7 +302,7 @@ void WSWindowManager::paint_window_frame(WSWindow& window)
|
|||
m_back_painter->draw_rect(border_rect, middle_border_color);
|
||||
m_back_painter->draw_rect(outer_rect, border_color);
|
||||
m_back_painter->draw_rect(inner_border_rect, border_color);
|
||||
m_back_painter->draw_text(titlebar_title_rect, window.title(), Painter::TextAlignment::CenterLeft, title_color);
|
||||
m_back_painter->draw_text(titlebar_title_rect, window.title(), TextAlignment::CenterLeft, title_color);
|
||||
|
||||
if (!s_close_button_bitmap)
|
||||
s_close_button_bitmap = CharacterBitmap::create_from_ascii(s_close_button_bitmap_data, s_close_button_bitmap_width, s_close_button_bitmap_height).leak_ref();
|
||||
|
@ -319,7 +319,7 @@ void WSWindowManager::paint_window_frame(WSWindow& window)
|
|||
m_back_painter->draw_text(
|
||||
titlebar_inner_rect,
|
||||
String::format("%d:%d", window.pid(), window.window_id()),
|
||||
Painter::TextAlignment::CenterRight,
|
||||
TextAlignment::CenterRight,
|
||||
metadata_color
|
||||
);
|
||||
#endif
|
||||
|
@ -476,8 +476,11 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event)
|
|||
return;
|
||||
}
|
||||
|
||||
// FIXME: Figure out an automatic menu dismissal logic that feels right.
|
||||
#if 0
|
||||
if (m_current_menu && event.type() == WSMouseEvent::MouseUp && event.button() == MouseButton::Left)
|
||||
close_current_menu();
|
||||
#endif
|
||||
|
||||
for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) {
|
||||
if (!window->is_visible())
|
||||
|
@ -610,10 +613,10 @@ void WSWindowManager::draw_menubar()
|
|||
m_current_menubar->for_each_menu([&] (WSMenu& menu) {
|
||||
Color text_color = Color::Black;
|
||||
if (&menu == m_current_menu) {
|
||||
m_back_painter->fill_rect(menu.rect_in_menubar(), Color(0, 0, 128));
|
||||
m_back_painter->fill_rect(menu.rect_in_menubar(), Color(0, 0, 104));
|
||||
text_color = Color::White;
|
||||
}
|
||||
m_back_painter->draw_text(menu.text_rect_in_menubar(), menu.name(), Painter::TextAlignment::CenterLeft, text_color);
|
||||
m_back_painter->draw_text(menu.text_rect_in_menubar(), menu.name(), TextAlignment::CenterLeft, text_color);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue