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

LibDraw: Add Button and ButtonText system theme colors

Browse source 
These are now separate from the Window and WindowText colors.
This commit is contained in:
Andreas Kling 2019-12-24 02:10:01 +01:00
parent 9171aef724
commit df3a2dba43
21 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Servers/WindowServer/WSMenuManager.cpp
View file

@ -87,7 +87,7 @@ void WSMenuManager::draw()
painter.draw_line({ 0, menubar_rect.bottom() }, { menubar_rect.right(), menubar_rect.bottom() }, SystemColor::ThreedShadow1);
int index = 0;
wm.for_each_active_menubar_menu([&](WSMenu& menu) {
Color text_color = SystemColor::Text;
Color text_color = SystemColor::WindowText;
if (is_open(menu)) {
painter.fill_rect(menu.rect_in_menubar(), SystemColor::MenuSelection);
painter.draw_rect(menu.rect_in_menubar(), Color(SystemColor::MenuSelection).darkened());
@ -103,7 +103,7 @@ void WSMenuManager::draw()
return IterationDecision::Continue;
});
painter.draw_text(m_username_rect, m_username, Font::default_bold_font(), TextAlignment::CenterRight, SystemColor::Text);
painter.draw_text(m_username_rect, m_username, Font::default_bold_font(), TextAlignment::CenterRight, SystemColor::WindowText);
time_t now = time(nullptr);
auto* tm = localtime(&now);
@ -115,7 +115,7 @@ void WSMenuManager::draw()
tm->tm_min,
tm->tm_sec);
painter.draw_text(m_time_rect, time_text, wm.font(), TextAlignment::CenterRight, SystemColor::Text);
painter.draw_text(m_time_rect, time_text, wm.font(), TextAlignment::CenterRight, SystemColor::WindowText);
for (auto& applet : m_applets) {
if (!applet)