RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 01:05:07 +00:00
Code Issues Activity Actions

LibGUI+LibDraw: Add "Palette" concept for scoped color theming

Browse source 
GApplication now has a palette. This palette contains all the system
theme colors by default, and is inherited by a new top-level GWidget.
New child widgets inherit their parents palette.

It is possible to override the GApplication palette, and the palette
of any GWidget.

The Palette object contains a bunch of colors, each corresponding to
a ColorRole. Each role has a convenience getter as well.

Each GWidget now has a background_role() and foreground_role(), which
are then looked up in their current palette when painting. This means
that you no longer alter the background color of a widget by setting
it directly, rather you alter either its background role, or the
widget's palette.
This commit is contained in:
Andreas Kling 2019-12-24 20:57:54 +01:00
parent cb4e51a7a5
commit a79bac428b
62 changed files with 448 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibGUI/GListView.cpp
View file

@ -1,4 +1,5 @@
#include <Kernel/KeyCode.h>
#include <LibDraw/Palette.h>
#include <LibGUI/GListView.h>
#include <LibGUI/GPainter.h>
#include <LibGUI/GScrollBar.h>
@ -6,6 +7,7 @@
GListView::GListView(GWidget* parent)
: GAbstractView(parent)
{
set_background_role(ColorRole::Base);
set_frame_shape(FrameShape::Container);
set_frame_shadow(FrameShadow::Sunken);
set_frame_thickness(2);
@ -104,12 +106,12 @@ void GListView::paint_event(GPaintEvent& event)
Color background_color;
if (is_selected_row) {
background_color = is_focused() ? Color(SystemColor::SelectionText) : Color::from_rgb(0x606060);
background_color = is_focused() ? palette().selection_text() : Color::from_rgb(0x606060);
} else {
if (alternating_row_colors() && (painted_item_index % 2))
background_color = Color(210, 210, 210);
else
background_color = SystemColor::Base;
background_color = palette().color(background_role());
}
auto column_metadata = model()->column_metadata(m_model_column);
@ -129,7 +131,7 @@ void GListView::paint_event(GPaintEvent& event)
if (is_selected_row)
text_color = Color::White;
else
text_color = model()->data(index, GModel::Role::ForegroundColor).to_color(SystemColor::WindowText);
text_color = model()->data(index, GModel::Role::ForegroundColor).to_color(palette().color(foreground_role()));
auto text_rect = row_rect;
text_rect.move_by(horizontal_padding(), 0);
text_rect.set_width(text_rect.width() - horizontal_padding() * 2);
@ -140,7 +142,7 @@ void GListView::paint_event(GPaintEvent& event)
};
Rect unpainted_rect(0, painted_item_index * item_height(), exposed_width, height());
painter.fill_rect(unpainted_rect, SystemColor::Base);
painter.fill_rect(unpainted_rect, palette().color(background_role()));
}
int GListView::item_count() const