RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:07:44 +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

6
Libraries/LibGUI/GWidget.h
View file

@ -8,6 +8,7 @@
#include <LibDraw/Color.h>
#include <LibDraw/Font.h>
#include <LibDraw/Orientation.h>
#include <LibDraw/Palette.h>
#include <LibDraw/Rect.h>
#include <LibDraw/SystemTheme.h>
#include <LibGUI/GEvent.h>
@ -22,7 +23,6 @@ class GLayout;
class GMenu;
class GWindow;
class GraphicsBitmap;
class Palette;
enum class SizePolicy {
Fixed,
@ -237,7 +237,7 @@ public:
void do_layout();
const Palette& palette() const { return *m_palette; }
Palette palette() const { return Palette(*m_palette); }
void set_palette(const Palette&);
protected:
@ -301,7 +301,7 @@ private:
HashMap<GShortcut, GAction*> m_local_shortcut_actions;
NonnullRefPtr<Palette> m_palette;
NonnullRefPtr<PaletteImpl> m_palette;
};
template<>