mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 04:07:44 +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
|
@ -118,7 +118,7 @@ void HtmlView::paint_event(GPaintEvent& event)
|
|||
painter.add_clip_rect(event.rect());
|
||||
|
||||
if (!layout_root()) {
|
||||
painter.fill_rect(event.rect(), background_color());
|
||||
painter.fill_rect(event.rect(), palette().color(background_role()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -131,7 +131,7 @@ void HtmlView::paint_event(GPaintEvent& event)
|
|||
painter.translate(frame_thickness(), frame_thickness());
|
||||
painter.translate(-horizontal_scrollbar().value(), -vertical_scrollbar().value());
|
||||
|
||||
RenderingContext context { painter };
|
||||
RenderingContext context(painter, palette());
|
||||
context.set_should_show_line_box_borders(m_should_show_line_box_borders);
|
||||
context.set_viewport_rect(visible_content_rect());
|
||||
layout_root()->render(context);
|
||||
|
|
|
@ -43,7 +43,7 @@ void LayoutImage::render(RenderingContext& context)
|
|||
|
||||
if (renders_as_alt_text()) {
|
||||
context.painter().set_font(Font::default_font());
|
||||
StylePainter::paint_frame(context.painter(), enclosing_int_rect(rect()), FrameShape::Container, FrameShadow::Sunken, 2);
|
||||
StylePainter::paint_frame(context.painter(), enclosing_int_rect(rect()), context.palette(), FrameShape::Container, FrameShadow::Sunken, 2);
|
||||
auto alt = node().alt();
|
||||
if (alt.is_empty())
|
||||
alt = node().src();
|
||||
|
|
|
@ -1,17 +1,20 @@
|
|||
#pragma once
|
||||
|
||||
#include <LibDraw/Palette.h>
|
||||
#include <LibDraw/Rect.h>
|
||||
|
||||
class GPainter;
|
||||
|
||||
class RenderingContext {
|
||||
public:
|
||||
explicit RenderingContext(GPainter& painter)
|
||||
explicit RenderingContext(GPainter& painter, const Palette& palette)
|
||||
: m_painter(painter)
|
||||
, m_palette(palette)
|
||||
{
|
||||
}
|
||||
|
||||
GPainter& painter() const { return m_painter; }
|
||||
const Palette& palette() const { return m_palette; }
|
||||
|
||||
bool should_show_line_box_borders() const { return m_should_show_line_box_borders; }
|
||||
void set_should_show_line_box_borders(bool value) { m_should_show_line_box_borders = value; }
|
||||
|
@ -21,6 +24,7 @@ public:
|
|||
|
||||
private:
|
||||
GPainter& m_painter;
|
||||
const Palette& m_palette;
|
||||
Rect m_viewport_rect;
|
||||
bool m_should_show_line_box_borders { false };
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue