mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-28 23:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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
Notes: sideshowbarker 2024-07-19 10:42:29 +09:00
62 changed files with 448 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Libraries/LibGUI/GTableView.cpp
View file

@ -1,5 +1,6 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibDraw/Palette.h>
#include <LibGUI/GAction.h>
#include <LibGUI/GMenu.h>
#include <LibGUI/GModel.h>
@ -12,6 +13,7 @@
GTableView::GTableView(GWidget* parent)
: GAbstractColumnView(parent)
{
set_background_role(ColorRole::Base);
}
GTableView::~GTableView()
@ -20,12 +22,13 @@ GTableView::~GTableView()
void GTableView::paint_event(GPaintEvent& event)
{
Color widget_background_color = palette().color(background_role());
GFrame::paint_event(event);
GPainter painter(*this);
painter.add_clip_rect(frame_inner_rect());
painter.add_clip_rect(event.rect());
painter.fill_rect(event.rect(), SystemColor::Base);
painter.fill_rect(event.rect(), widget_background_color);
painter.translate(frame_thickness(), frame_thickness());
painter.translate(-horizontal_scrollbar().value(), -vertical_scrollbar().value());
@ -53,15 +56,15 @@ void GTableView::paint_event(GPaintEvent& event)
Color background_color;
Color key_column_background_color;
if (is_selected_row) {
background_color = is_focused() ? Color(SystemColor::Selection) : Color::from_rgb(0x606060);
key_column_background_color = is_focused() ? Color(SystemColor::Selection) : Color::from_rgb(0x606060);
background_color = is_focused() ? palette().selection() : Color::from_rgb(0x606060);
key_column_background_color = is_focused() ? palette().selection() : Color::from_rgb(0x606060);
} else {
if (alternating_row_colors() && (painted_item_index % 2)) {
background_color = Color(SystemColor::Base).darkened(0.8f);
key_column_background_color = Color(SystemColor::Base).darkened(0.7f);
background_color = widget_background_color.darkened(0.8f);
key_column_background_color = widget_background_color.darkened(0.7f);
} else {
background_color = SystemColor::Base;
key_column_background_color = Color(SystemColor::Base).darkened(0.9f);
background_color = widget_background_color;
key_column_background_color = widget_background_color.darkened(0.9f);
}
}
painter.fill_rect(row_rect(painted_item_index), background_color);
@ -82,7 +85,7 @@ void GTableView::paint_event(GPaintEvent& event)
auto cell_index = model()->index(row_index, column_index);
if (auto* delegate = column_data(column_index).cell_painting_delegate.ptr()) {
delegate->paint(painter, cell_rect, *model(), cell_index);
delegate->paint(painter, cell_rect, palette(), *model(), cell_index);
} else {
auto data = model()->data(cell_index);
if (data.is_bitmap()) {
@ -93,9 +96,9 @@ void GTableView::paint_event(GPaintEvent& event)
} else {
Color text_color;
if (is_selected_row)
text_color = SystemColor::SelectionText;
text_color = palette().selection_text();
else
text_color = model()->data(cell_index, GModel::Role::ForegroundColor).to_color(SystemColor::WindowText);
text_color = model()->data(cell_index, GModel::Role::ForegroundColor).to_color(palette().color(foreground_role()));
painter.draw_text(cell_rect, data.to_string(), font, column_metadata.text_alignment, text_color, TextElision::Right);
}
}
@ -105,7 +108,7 @@ void GTableView::paint_event(GPaintEvent& event)
};
Rect unpainted_rect(0, header_height() + painted_item_index * item_height(), exposed_width, height());
painter.fill_rect(unpainted_rect, SystemColor::Base);
painter.fill_rect(unpainted_rect, widget_background_color);
// Untranslate the painter vertically and do the column headers.
painter.translate(0, vertical_scrollbar().value());