LibGUI: Import GColorPicker from the PaintBrush application

Applications/PaintBrush/Makefile

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

Applications/PaintBrush/PaletteWidget.cpp

@@ -25,9 +25,9 @@
  */
 
 #include "PaletteWidget.h"
-#include "ColorDialog.h"
 #include "PaintableWidget.h"
 #include <LibGUI/GBoxLayout.h>
+#include <LibGUI/GColorPicker.h>
 
 class ColorWidget : public GFrame {
     C_OBJECT(ColorWidget)
@@ -49,7 +49,7 @@ public:
     virtual void mousedown_event(GMouseEvent& event) override
     {
         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) {
                 m_color = dialog->color();
                 auto pal = palette();

Libraries/LibGUI/GColorPicker.cpp

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

Libraries/LibGUI/GColorPicker.h

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

Libraries/LibGUI/Makefile

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