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

LibGUI: Import GColorPicker from the PaintBrush application

Browse source
This commit is contained in:
Andreas Kling 2020-01-21 20:25:33 +01:00
parent 30ad7953ca
commit a14f08fcc9
5 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Applications/PaintBrush/Makefile
View file

@ -9,7 +9,6 @@ OBJS = \
EllipseTool.o \ EllipseTool.o \
EraseTool.o \ EraseTool.o \
BucketTool.o \ BucketTool.o \
ColorDialog.o \
SprayTool.o \ SprayTool.o \
PickerTool.o \ PickerTool.o \
main.o main.o

4
Applications/PaintBrush/PaletteWidget.cpp
View file

@ -25,9 +25,9 @@
*/ */
#include "PaletteWidget.h" #include "PaletteWidget.h"
#include "ColorDialog.h"
#include "PaintableWidget.h" #include "PaintableWidget.h"
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GColorPicker.h>
class ColorWidget : public GFrame { class ColorWidget : public GFrame {
C_OBJECT(ColorWidget) C_OBJECT(ColorWidget)
@ -49,7 +49,7 @@ public:
virtual void mousedown_event(GMouseEvent& event) override virtual void mousedown_event(GMouseEvent& event) override
{ {
if (event.modifiers() & KeyModifier::Mod_Ctrl && event.button() == GMouseButton::Left) { if (event.modifiers() & KeyModifier::Mod_Ctrl && event.button() == GMouseButton::Left) {
auto dialog = ColorDialog::construct(m_color, window()); auto dialog = GColorPicker::construct(m_color, window());
if (dialog->exec() == GDialog::ExecOK) { if (dialog->exec() == GDialog::ExecOK) {
m_color = dialog->color(); m_color = dialog->color();
auto pal = palette(); auto pal = palette();

12
Applications/PaintBrush/ColorDialog.cpp → Libraries/LibGUI/GColorPicker.cpp
View file

@ -24,14 +24,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "ColorDialog.h"
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <LibGUI/GColorPicker.h>
#include <LibGUI/GFrame.h> #include <LibGUI/GFrame.h>
#include <LibGUI/GSpinBox.h> #include <LibGUI/GSpinBox.h>
#include <LibGUI/GWidget.h> #include <LibGUI/GWidget.h>
ColorDialog::ColorDialog(Color color, CObject* parent) GColorPicker::GColorPicker(Color color, CObject* parent)
: GDialog(parent) : GDialog(parent)
, m_color(color) , m_color(color)
{ {
@ -39,11 +39,11 @@ ColorDialog::ColorDialog(Color color, CObject* parent)
build(); build();
} }
ColorDialog::~ColorDialog() GColorPicker::~GColorPicker()
{ {
} }
void ColorDialog::build() void GColorPicker::build()
{ {
auto horizontal_container = GWidget::construct(); auto horizontal_container = GWidget::construct();
horizontal_container->set_fill_with_background_color(true); horizontal_container->set_fill_with_background_color(true);
@ -58,7 +58,9 @@ void ColorDialog::build()
right_vertical_container->set_layout(make<GBoxLayout>(Orientation::Vertical)); right_vertical_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
enum RGBComponent { enum RGBComponent {
Red, Green, Blue Red,
Green,
Blue
}; };
m_preview_widget = GFrame::construct(right_vertical_container); m_preview_widget = GFrame::construct(right_vertical_container);

8
Applications/PaintBrush/ColorDialog.h → Libraries/LibGUI/GColorPicker.h
View file

@ -30,15 +30,15 @@
class GFrame; class GFrame;
class ColorDialog final : public GDialog { class GColorPicker final : public GDialog {
C_OBJECT(ColorDialog) C_OBJECT(GColorPicker)
public: public:
virtual ~ColorDialog() override; virtual ~GColorPicker() override;
Color color() const { return m_color; } Color color() const { return m_color; }
private: private:
explicit ColorDialog(Color, CObject* parent = nullptr); explicit GColorPicker(Color, CObject* parent = nullptr);
void build(); void build();

1
Libraries/LibGUI/Makefile
View file

@ -10,6 +10,7 @@ OBJS = \
GWidget.o \ GWidget.o \
GLayout.o \ GLayout.o \
GBoxLayout.o \ GBoxLayout.o \
GColorPicker.o \
GMenuBar.o \ GMenuBar.o \
GMenu.o \ GMenu.o \
GMenuItem.o \ GMenuItem.o \