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

GUI: Use Win2K-like "warm gray" color instead of the older colder gray.

Browse source 
Someone suggested this a long time ago and I never got around to it.
So here we go, here's the warm gray! I have to admit I like it better. :^)
This commit is contained in:
Andreas Kling 2019-06-30 09:23:16 +02:00
parent 73d0e7cd8f
commit 315716d193
29 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/WindowServer/WSCompositor.cpp
View file

@ -314,7 +314,7 @@ void WSCompositor::draw_geometry_label()
}
auto geometry_label_rect = Rect { 0, 0, wm.font().width(geometry_string) + 16, wm.font().glyph_height() + 10 };
geometry_label_rect.center_within(window_being_moved_or_resized->rect());
m_back_painter->fill_rect(geometry_label_rect, Color::LightGray);
m_back_painter->fill_rect(geometry_label_rect, Color::WarmGray);
m_back_painter->draw_rect(geometry_label_rect, Color::DarkGray);
m_back_painter->draw_text(geometry_label_rect, geometry_string, TextAlignment::Center);
m_last_geometry_label_rect = geometry_label_rect;

2
Servers/WindowServer/WSMenu.cpp
View file

@ -116,7 +116,7 @@ void WSMenu::draw()
Painter painter(*menu_window()->backing_store());
Rect rect { {}, menu_window()->size() };
painter.fill_rect(rect.shrunken(6, 6), Color::LightGray);
painter.fill_rect(rect.shrunken(6, 6), Color::WarmGray);
StylePainter::paint_window_frame(painter, rect);
int width = this->width();

2
Servers/WindowServer/WSMenuBarKeeper.cpp
View file

@ -38,7 +38,7 @@ void WSMenuBarKeeper::draw()
Painter painter(*window().backing_store());
painter.fill_rect(menubar_rect, Color::LightGray);
painter.fill_rect(menubar_rect, Color::WarmGray);
painter.draw_line({ 0, menubar_rect.bottom() }, { menubar_rect.right(), menubar_rect.bottom() }, Color::MidGray);
int index = 0;
wm.for_each_active_menubar_menu([&](WSMenu& menu) {

2
Servers/WindowServer/WSWindow.h
View file

@ -176,7 +176,7 @@ private:
String m_icon_path;
RefPtr<WSCursor> m_override_cursor;
WSWindowFrame m_frame;
Color m_background_color { Color::LightGray };
Color m_background_color { Color::WarmGray };
unsigned m_wm_event_mask { 0 };
DisjointRectSet m_pending_paint_rects;
Rect m_unmaximized_rect;

2
Servers/WindowServer/WSWindowFrame.cpp
View file

@ -192,7 +192,7 @@ void WSWindowFrame::paint(Painter& painter)
if (!window.show_titlebar())
return;
painter.draw_line(titlebar_rect.bottom_left().translated(0, 1), titlebar_rect.bottom_right().translated(0, 1), Color::LightGray);
painter.draw_line(titlebar_rect.bottom_left().translated(0, 1), titlebar_rect.bottom_right().translated(0, 1), Color::WarmGray);
auto leftmost_button_rect = m_buttons.is_empty() ? Rect() : m_buttons.last()->relative_rect();

6
Servers/WindowServer/WSWindowSwitcher.cpp
View file

@ -70,7 +70,7 @@ void WSWindowSwitcher::on_key_event(const WSKeyEvent& event)
void WSWindowSwitcher::draw()
{
Painter painter(*m_switcher_window->backing_store());
painter.fill_rect({ {}, m_rect.size() }, Color::LightGray);
painter.fill_rect({ {}, m_rect.size() }, Color::WarmGray);
painter.draw_rect({ {}, m_rect.size() }, Color::DarkGray);
for (int index = 0; index < m_windows.size(); ++index) {
auto& window = *m_windows.at(index);
@ -85,7 +85,7 @@ void WSWindowSwitcher::draw()
if (index == m_selected_index) {
painter.fill_rect(item_rect, Color::from_rgb(0x84351a));
text_color = Color::White;
rect_text_color = Color::LightGray;
rect_text_color = Color::WarmGray;
} else {
text_color = Color::Black;
rect_text_color = Color::MidGray;
@ -97,7 +97,7 @@ void WSWindowSwitcher::draw()
StylePainter::paint_frame(painter, thumbnail_rect.inflated(4, 4), FrameShape::Container, FrameShadow::Sunken, 2);
}
Rect icon_rect = { thumbnail_rect.bottom_right().translated(-window.icon().width(), -window.icon().height()), { window.icon().width(), window.icon().height() } };
painter.fill_rect(icon_rect, Color::LightGray);
painter.fill_rect(icon_rect, Color::WarmGray);
painter.blit(icon_rect.location(), window.icon(), window.icon().rect());
painter.draw_text(item_rect.translated(thumbnail_width() + 12, 0), window.title(), WSWindowManager::the().window_title_font(), TextAlignment::CenterLeft, text_color);
painter.draw_text(item_rect, window.rect().to_string(), TextAlignment::CenterRight, rect_text_color);