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: Improve the look of menu separators.

Browse source
This commit is contained in:
Andreas Kling 2019-04-18 19:58:25 +02:00
parent b88f2bc799
commit 3c0afccca0
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Servers/WindowServer/WSMenu.cpp
View file

@ -59,6 +59,7 @@ void WSMenu::redraw()
WSWindow& WSMenu::ensure_menu_window() WSWindow& WSMenu::ensure_menu_window()
{ {
int width = this->width();
if (!m_menu_window) { if (!m_menu_window) {
Point next_item_location(frame_thickness(), frame_thickness()); Point next_item_location(frame_thickness(), frame_thickness());
for (auto& item : m_items) { for (auto& item : m_items) {
@ -66,14 +67,14 @@ WSWindow& WSMenu::ensure_menu_window()
if (item->type() == WSMenuItem::Text) if (item->type() == WSMenuItem::Text)
height = item_height(); height = item_height();
else if (item->type() == WSMenuItem::Separator) else if (item->type() == WSMenuItem::Separator)
height = 7; height = 8;
item->set_rect({ next_item_location, { width() - frame_thickness() * 2, height } }); item->set_rect({ next_item_location, { width - frame_thickness() * 2, height } });
next_item_location.move_by(0, height); next_item_location.move_by(0, height);
} }
auto window = make<WSWindow>(*this, WSWindowType::Menu); auto window = make<WSWindow>(*this, WSWindowType::Menu);
window->set_opacity(0.95f); window->set_opacity(0.95f);
window->set_rect(0, 0, width(), height()); window->set_rect(0, 0, width, height());
m_menu_window = move(window); m_menu_window = move(window);
draw(); draw();
} }
@ -89,6 +90,7 @@ void WSMenu::draw()
Rect rect { { }, menu_window()->size() }; Rect rect { { }, menu_window()->size() };
painter.fill_rect(rect.shrunken(4, 4), Color::LightGray); painter.fill_rect(rect.shrunken(4, 4), Color::LightGray);
StylePainter::paint_menu_frame(painter, rect); StylePainter::paint_menu_frame(painter, rect);
int width = this->width();
for (auto& item : m_items) { for (auto& item : m_items) {
if (item->type() == WSMenuItem::Text) { if (item->type() == WSMenuItem::Text) {
@ -104,9 +106,10 @@ void WSMenu::draw()
painter.draw_text(item->rect().translated(-right_padding(), 0), item->shortcut_text(), TextAlignment::CenterRight, text_color); painter.draw_text(item->rect().translated(-right_padding(), 0), item->shortcut_text(), TextAlignment::CenterRight, text_color);
} }
} else if (item->type() == WSMenuItem::Separator) { } else if (item->type() == WSMenuItem::Separator) {
Point p1(1, item->rect().center().y()); Point p1(4, item->rect().center().y());
Point p2(width() - 2, item->rect().center().y()); Point p2(width - 5, item->rect().center().y());
painter.draw_line(p1, p2, Color::MidGray); painter.draw_line(p1, p2, Color::MidGray);
painter.draw_line(p1.translated(0, 1), p2.translated(0, 1), Color::White);
} }
} }
} }

2
Servers/WindowServer/WSMenu.h
View file

@ -54,7 +54,7 @@ public:
int width() const; int width() const;
int height() const; int height() const;
int item_height() const { return 18; } int item_height() const { return 16; }
int frame_thickness() const { return 2; } int frame_thickness() const { return 2; }
int horizontal_padding() const { return left_padding() + right_padding(); } int horizontal_padding() const { return left_padding() + right_padding(); }
int left_padding() const { return 14; } int left_padding() const { return 14; }