RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 21:57:35 +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
Applications/IRCClient/IRCAppWindow.cpp
View file

@ -133,7 +133,7 @@ void IRCAppWindow::setup_widgets()
auto* widget = new GWidget(nullptr);
set_main_widget(widget);
widget->set_fill_with_background_color(true);
widget->set_background_color(Color::LightGray);
widget->set_background_color(Color::WarmGray);
widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
widget->layout()->set_margins({ 4, 4, 4, 4 });

2
Applications/IRCClient/IRCWindowListModel.cpp
View file

@ -61,7 +61,7 @@ GVariant IRCWindowListModel::data(const GModelIndex& index, Role role) const
if (window.unread_count())
return Color(Color::Red);
if (!window.channel().is_open())
return Color(Color::LightGray);
return Color(Color::WarmGray);
return Color(Color::Black);
}
}

2
Applications/PaintBrush/PaletteWidget.cpp
View file

@ -50,7 +50,7 @@ PaletteWidget::PaletteWidget(PaintableWidget& paintable_widget, GWidget* parent)
set_frame_shadow(FrameShadow::Raised);
set_frame_thickness(0);
set_fill_with_background_color(true);
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
set_preferred_size({ 0, 34 });

2
Applications/PaintBrush/ToolboxWidget.cpp
View file

@ -33,7 +33,7 @@ private:
ToolboxWidget::ToolboxWidget(GWidget* parent)
: GFrame(parent)
{
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
set_fill_with_background_color(true);
set_frame_thickness(1);

4
Applications/ProcessManager/main.cpp
View file

@ -23,7 +23,7 @@ int main(int argc, char** argv)
auto* keeper = new GWidget;
keeper->set_layout(make<GBoxLayout>(Orientation::Vertical));
keeper->set_fill_with_background_color(true);
keeper->set_background_color(Color::LightGray);
keeper->set_background_color(Color::WarmGray);
keeper->layout()->set_margins({ 4, 4, 4, 4 });
auto* tabwidget = new GTabWidget(keeper);
@ -33,7 +33,7 @@ int main(int argc, char** argv)
auto* graphs_container = new GWidget;
graphs_container->set_fill_with_background_color(true);
graphs_container->set_background_color(Color::LightGray);
graphs_container->set_background_color(Color::WarmGray);
graphs_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
graphs_container->layout()->set_margins({ 4, 4, 4, 4 });

2
Applications/Terminal/main.cpp
View file

@ -116,7 +116,7 @@ GWindow* create_settings_window(Terminal& terminal, RefPtr<CConfigFile> config)
slider_container->set_preferred_size({ 100, 50 });
auto* slider = new GSlider(slider_container);
slider->set_fill_with_background_color(true);
slider->set_background_color(Color::LightGray);
slider->set_background_color(Color::WarmGray);
slider->on_value_changed = [&terminal, &config](int value) {
terminal.set_opacity(value);

2
Demos/PaintTest/main.cpp
View file

@ -23,7 +23,7 @@ private:
{
GPainter painter(*this);
painter.fill_rect(rect(), Color::LightGray);
painter.fill_rect(rect(), Color::WarmGray);
painter.blit_tiled({ 0, 0, 160, 160 }, *m_bitmap, m_bitmap->rect());

2
DevTools/VisualBuilder/VBForm.cpp
View file

@ -22,7 +22,7 @@ VBForm::VBForm(const String& name, GWidget* parent)
{
s_current = this;
set_fill_with_background_color(true);
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
set_greedy_for_hits(true);
m_context_menu = make<GMenu>("Context menu");

2
Games/Minesweeper/Field.cpp
View file

@ -117,7 +117,7 @@ Field::Field(GLabel& flag_label, GLabel& time_label, GButton& face_button, GWidg
m_number_bitmap[i] = GraphicsBitmap::load_from_file(String::format("/res/icons/minesweeper/%u.png", i + 1));
set_fill_with_background_color(true);
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
reset();
m_face_button.on_click = [this](auto&) { reset(); };

2
LibGUI/GFilePicker.cpp
View file

@ -23,7 +23,7 @@ GFilePicker::GFilePicker(const StringView& path, CObject* parent)
horizontal_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
horizontal_container->layout()->set_margins({ 4, 4, 4, 4 });
horizontal_container->set_fill_with_background_color(true);
horizontal_container->set_background_color(Color::LightGray);
horizontal_container->set_background_color(Color::WarmGray);
auto* vertical_container = new GWidget(horizontal_container);
vertical_container->set_layout(make<GBoxLayout>(Orientation::Vertical));

2
LibGUI/GGroupBox.cpp
View file

@ -7,7 +7,7 @@ GGroupBox::GGroupBox(const StringView& title, GWidget* parent)
, m_title(title)
{
set_fill_with_background_color(true);
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
}
GGroupBox::~GGroupBox()

4
LibGUI/GSplitter.cpp
View file

@ -8,7 +8,7 @@ GSplitter::GSplitter(Orientation orientation, GWidget* parent)
{
set_layout(make<GBoxLayout>(orientation));
set_fill_with_background_color(true);
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
layout()->set_spacing(4);
}
@ -25,7 +25,7 @@ void GSplitter::enter_event(CEvent&)
void GSplitter::leave_event(CEvent&)
{
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
if (!m_resizing)
window()->set_override_cursor(GStandardCursor::None);
update();

2
LibGUI/GTabWidget.cpp
View file

@ -7,7 +7,7 @@ GTabWidget::GTabWidget(GWidget* parent)
: GWidget(parent)
{
set_fill_with_background_color(true);
set_background_color(Color::LightGray);
set_background_color(Color::WarmGray);
}
GTabWidget::~GTabWidget()

2
LibGUI/GTableView.cpp
View file

@ -282,7 +282,7 @@ void GTableView::paint_event(GPaintEvent& event)
void GTableView::paint_headers(Painter& painter)
{
int exposed_width = max(content_size().width(), width());
painter.fill_rect({ 0, 0, exposed_width, header_height() }, Color::LightGray);
painter.fill_rect({ 0, 0, exposed_width, header_height() }, Color::WarmGray);
painter.draw_line({ 0, 0 }, { exposed_width - 1, 0 }, Color::White);
painter.draw_line({ 0, header_height() - 1 }, { exposed_width - 1, header_height() - 1 }, Color::MidGray);
int x_offset = 0;

2
LibGUI/GTextEditor.cpp
View file

@ -272,7 +272,7 @@ void GTextEditor::paint_event(GPaintEvent& event)
Rect ruler_rect { 0, 0, ruler_width(), height() - height_occupied_by_horizontal_scrollbar() };
if (m_ruler_visible) {
painter.fill_rect(ruler_rect, Color::LightGray);
painter.fill_rect(ruler_rect, Color::WarmGray);
painter.draw_line(ruler_rect.top_right(), ruler_rect.bottom_right(), Color::DarkGray);
}

2
LibGUI/GToolBar.cpp
View file

@ -85,5 +85,5 @@ void GToolBar::paint_event(GPaintEvent& event)
if (m_has_frame)
StylePainter::paint_surface(painter, rect(), x() != 0, y() != 0);
else
painter.fill_rect(event.rect(), Color::LightGray);
painter.fill_rect(event.rect(), Color::WarmGray);
}

2
LibGUI/GTreeView.cpp
View file

@ -143,7 +143,7 @@ void GTreeView::paint_event(GPaintEvent& event)
if (!rect.intersects(visible_content_rect))
return IterationDecision::Continue;
#ifdef DEBUG_ITEM_RECTS
painter.fill_rect(rect, Color::LightGray);
painter.fill_rect(rect, Color::WarmGray);
#endif
Color background_color = Color::from_rgb(0xffffff);

2
LibGUI/GWidget.cpp
View file

@ -15,7 +15,7 @@ GWidget::GWidget(GWidget* parent)
: CObject(parent, true)
{
set_font(nullptr);
m_background_color = Color::LightGray;
m_background_color = Color::WarmGray;
m_foreground_color = Color::Black;
}

2
LibGUI/GWindow.cpp
View file

@ -372,7 +372,7 @@ void GWindow::paint_keybinds()
Rect rect { widget.x() - 5, widget.y() - 5, 4 + Font::default_font().width(keypair.key), 16 };
Rect highlight_rect { widget.x() - 3, widget.y() - 5, 0, 16 };
painter.fill_rect(rect, Color::LightGray);
painter.fill_rect(rect, Color::WarmGray);
painter.draw_rect(rect, Color::Black);
painter.draw_text(rect, keypair.key.characters(), TextAlignment::Center, Color::Black);
painter.draw_text(highlight_rect, m_entered_keybind.characters(), TextAlignment::CenterLeft, Color::MidGray);

2
LibGUI/GWindow.h
View file

@ -157,7 +157,7 @@ private:
Vector<Rect, 32> m_pending_paint_event_rects;
Size m_size_increment;
Size m_base_size;
Color m_background_color { Color::LightGray };
Color m_background_color { Color::WarmGray };
GWindowType m_window_type { GWindowType::Normal };
bool m_is_active { false };
bool m_should_exit_app_on_close { false };

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);

3
SharedGraphics/Color.cpp
View file

@ -64,6 +64,9 @@ Color::Color(NamedColor named)
case DarkRed:
rgb = { 128, 0, 0 };
break;
case WarmGray:
rgb = { 212, 208, 200 };
break;
default:
ASSERT_NOT_REACHED();
break;

1
SharedGraphics/Color.h
View file

@ -24,6 +24,7 @@ public:
DarkGray,
MidGray,
LightGray,
WarmGray,
DarkGreen,
DarkBlue,
DarkRed,

14
SharedGraphics/StylePainter.cpp
View file

@ -3,7 +3,7 @@
void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, bool active, bool hovered, bool enabled)
{
Color base_color = Color::from_rgb(0xc0c0c0);
Color base_color = Color::WarmGray;
Color highlight_color2 = Color::from_rgb(0xdfdfdf);
Color shadow_color1 = Color::from_rgb(0x808080);
Color shadow_color2 = Color::from_rgb(0x404040);
@ -44,7 +44,7 @@ void StylePainter::paint_tab_button(Painter& painter, const Rect& rect, bool act
static void paint_button_new(Painter& painter, const Rect& rect, bool pressed, bool checked, bool hovered, bool enabled)
{
Color button_color = Color::from_rgb(0xc0c0c0);
Color button_color = Color::WarmGray;
Color highlight_color2 = Color::from_rgb(0xdfdfdf);
Color shadow_color1 = Color::from_rgb(0x808080);
Color shadow_color2 = Color::from_rgb(0x404040);
@ -92,7 +92,7 @@ void StylePainter::paint_button(Painter& painter, const Rect& rect, ButtonStyle
if (button_style == ButtonStyle::Normal)
return paint_button_new(painter, rect, pressed, checked, hovered, enabled);
Color button_color = checked ? Color::from_rgb(0xd6d2ce) : Color::LightGray;
Color button_color = checked ? Color::from_rgb(0xd6d2ce) : Color::WarmGray;
Color highlight_color = Color::White;
Color shadow_color = Color(96, 96, 96);
@ -129,8 +129,8 @@ void StylePainter::paint_button(Painter& painter, const Rect& rect, ButtonStyle
void StylePainter::paint_surface(Painter& painter, const Rect& rect, bool paint_vertical_lines, bool paint_top_line)
{
painter.fill_rect({ rect.x(), rect.y() + 1, rect.width(), rect.height() - 2 }, Color::LightGray);
painter.draw_line(rect.top_left(), rect.top_right(), paint_top_line ? Color::White : Color::LightGray);
painter.fill_rect({ rect.x(), rect.y() + 1, rect.width(), rect.height() - 2 }, Color::WarmGray);
painter.draw_line(rect.top_left(), rect.top_right(), paint_top_line ? Color::White : Color::WarmGray);
painter.draw_line(rect.bottom_left(), rect.bottom_right(), Color::MidGray);
if (paint_vertical_lines) {
painter.draw_line(rect.top_left().translated(0, 1), rect.bottom_left().translated(0, -1), Color::White);
@ -176,7 +176,7 @@ void StylePainter::paint_frame(Painter& painter, const Rect& rect, FrameShape sh
Color top_left_color;
Color bottom_right_color;
Color dark_shade = Color::from_rgb(0x404040);
Color light_shade = Color::from_rgb(0xc0c0c0);
Color light_shade = Color::WarmGray;
if (shadow == FrameShadow::Raised) {
dark_shade = Color::from_rgb(0x808080);
top_left_color = light_shade;
@ -207,7 +207,7 @@ void StylePainter::paint_frame(Painter& painter, const Rect& rect, FrameShape sh
void StylePainter::paint_window_frame(Painter& painter, const Rect& rect)
{
Color base_color = Color::from_rgb(0xc0c0c0);
Color base_color = Color::WarmGray;
Color dark_shade = Color::from_rgb(0x404040);
Color mid_shade = Color::from_rgb(0x808080);
Color light_shade = Color::from_rgb(0xffffff);