RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 14:17:36 +00:00
Code Issues Activity Actions

LibDraw+LibGUI: Allow changing individual colors in a Palette

Browse source 
Palette is now a value wrapper around a NonnullRefPtr<PaletteImpl>.
A new function, set_color(ColorRole, Color) implements a simple
copy-on-write mechanism so that we're sharing the PaletteImpl in the
common case, but allowing you to create custom palettes if you like,
by getting a GWidget's palette, modifying it, and then assigning the
modified palette to the widget via GWidget::set_palette().

Use this to make PaintBrush show its palette colors once again.

Fixes #943.
This commit is contained in:
Andreas Kling 2019-12-29 00:47:49 +01:00
parent 19d4f4c7b5
commit 7b2dd7e116
18 changed files with 98 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/WindowServer/WSButton.cpp
View file

@ -18,7 +18,7 @@ WSButton::~WSButton()
void WSButton::paint(Painter& painter)
{
auto& palette = WSWindowManager::the().palette();
auto palette = WSWindowManager::the().palette();
PainterStateSaver saver(painter);
painter.translate(relative_rect().location());
StylePainter::paint_button(painter, rect(), palette, ButtonStyle::Normal, m_pressed, m_hovered);

2
Servers/WindowServer/WSMenu.cpp
View file

@ -126,7 +126,7 @@ WSWindow& WSMenu::ensure_menu_window()
void WSMenu::draw()
{
auto& palette = WSWindowManager::the().palette();
auto palette = WSWindowManager::the().palette();
m_theme_index_at_last_paint = WSWindowManager::the().theme_index();
ASSERT(menu_window());

2
Servers/WindowServer/WSMenuManager.cpp
View file

@ -33,7 +33,7 @@ bool WSMenuManager::is_open(const WSMenu& menu) const
void WSMenuManager::draw()
{
auto& wm = WSWindowManager::the();
auto& palette = wm.palette();
auto palette = wm.palette();
auto menubar_rect = this->menubar_rect();
if (m_needs_window_resize) {

2
Servers/WindowServer/WSWindowFrame.cpp
View file

@ -153,7 +153,7 @@ void WSWindowFrame::paint(Painter& painter)
if (m_window.type() != WSWindowType::Normal)
return;
auto& palette = WSWindowManager::the().palette();
auto palette = WSWindowManager::the().palette();
auto& window = m_window;
auto titlebar_rect = title_bar_rect();

4
Servers/WindowServer/WSWindowManager.cpp
View file

@ -42,7 +42,7 @@ WSWindowManager& WSWindowManager::the()
return *s_the;
}
WSWindowManager::WSWindowManager(const Palette& palette)
WSWindowManager::WSWindowManager(const PaletteImpl& palette)
: m_palette(palette)
{
s_the = this;
@ -133,7 +133,7 @@ WSWindowManager::WSWindowManager(const Palette& palette)
auto new_theme = load_system_theme(theme.path);
ASSERT(new_theme);
set_system_theme(*new_theme);
m_palette = Palette::create_with_shared_buffer(*new_theme);
m_palette = PaletteImpl::create_with_shared_buffer(*new_theme);
HashTable<WSClientConnection*> notified_clients;
for_each_window([&](WSWindow& window) {
if (window.client()) {

6
Servers/WindowServer/WSWindowManager.h
View file

@ -51,10 +51,10 @@ class WSWindowManager : public CObject {
public:
static WSWindowManager& the();
explicit WSWindowManager(const Palette&);
explicit WSWindowManager(const PaletteImpl&);
virtual ~WSWindowManager() override;
const Palette& palette() const { return *m_palette; }
Palette palette() const { return Palette(*m_palette); }
RefPtr<CConfigFile> wm_config() const
{
@ -286,7 +286,7 @@ private:
WeakPtr<WSButton> m_cursor_tracking_button;
WeakPtr<WSButton> m_hovered_button;
NonnullRefPtr<Palette> m_palette;
NonnullRefPtr<PaletteImpl> m_palette;
RefPtr<CConfigFile> m_wm_config;

2
Servers/WindowServer/WSWindowSwitcher.cpp
View file

@ -71,7 +71,7 @@ void WSWindowSwitcher::on_key_event(const WSKeyEvent& event)
void WSWindowSwitcher::draw()
{
auto& palette = WSWindowManager::the().palette();
auto palette = WSWindowManager::the().palette();
Painter painter(*m_switcher_window->backing_store());
painter.fill_rect({ {}, m_rect.size() }, palette.window());
painter.draw_rect({ {}, m_rect.size() }, palette.threed_shadow2());

2
Servers/WindowServer/main.cpp
View file

@ -26,7 +26,7 @@ int main(int, char**)
auto theme = load_system_theme(String::format("/res/themes/%s.ini", theme_name.characters()));
ASSERT(theme);
set_system_theme(*theme);
auto palette = Palette::create_with_shared_buffer(*theme);
auto palette = PaletteImpl::create_with_shared_buffer(*theme);
WSEventLoop loop;