mirror of
https://github.com/RGBCube/serenity
synced 2025-05-18 21:35:06 +00:00
LibGUI+LibDraw: Add "Palette" concept for scoped color theming
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:
parent
cb4e51a7a5
commit
a79bac428b
62 changed files with 448 additions and 410 deletions
|
@ -53,7 +53,6 @@ int main(int argc, char** argv)
|
|||
auto keeper = GWidget::construct();
|
||||
keeper->set_layout(make<GBoxLayout>(Orientation::Vertical));
|
||||
keeper->set_fill_with_background_color(true);
|
||||
keeper->set_background_color(SystemColor::Window);
|
||||
keeper->layout()->set_margins({ 4, 4, 4, 4 });
|
||||
|
||||
auto tabwidget = GTabWidget::construct(keeper);
|
||||
|
@ -192,7 +191,7 @@ class ProgressBarPaintingDelegate final : public GTableCellPaintingDelegate {
|
|||
public:
|
||||
virtual ~ProgressBarPaintingDelegate() override {}
|
||||
|
||||
virtual void paint(GPainter& painter, const Rect& a_rect, const GModel& model, const GModelIndex& index) override
|
||||
virtual void paint(GPainter& painter, const Rect& a_rect, const Palette& palette, const GModel& model, const GModelIndex& index) override
|
||||
{
|
||||
auto rect = a_rect.shrunken(2, 2);
|
||||
auto percentage = model.data(index, GModel::Role::Custom).to_int();
|
||||
|
@ -201,7 +200,7 @@ public:
|
|||
String text;
|
||||
if (data.is_string())
|
||||
text = data.as_string();
|
||||
StylePainter::paint_progress_bar(painter, rect, 0, 100, percentage, text);
|
||||
StylePainter::paint_progress_bar(painter, rect, palette, 0, 100, percentage, text);
|
||||
painter.draw_rect(rect, Color::Black);
|
||||
}
|
||||
};
|
||||
|
@ -355,7 +354,7 @@ NonnullRefPtr<GWidget> build_graphs_tab()
|
|||
|
||||
graphs_container->on_first_show = [](auto& self) {
|
||||
self.set_fill_with_background_color(true);
|
||||
self.set_background_color(SystemColor::Window);
|
||||
self.set_background_role(ColorRole::Button);
|
||||
self.set_layout(make<GBoxLayout>(Orientation::Vertical));
|
||||
self.layout()->set_margins({ 4, 4, 4, 4 });
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue