colorpicker: implemented color management

Also moves some items to ColorManager from Project for better accessibility and
re-uses some widgets in ExportDialog for improved code.
This commit is contained in:
itsmattkc
2020-04-03 01:23:08 +11:00
parent 4d0b8f18e2
commit 552163320c
25 changed files with 394 additions and 124 deletions
+4 -3
View File
@@ -2,8 +2,9 @@
#include "dialog/color/colordialog.h"
ColorButton::ColorButton(QWidget *parent) :
QPushButton(parent)
ColorButton::ColorButton(ColorManager* color_manager, QWidget *parent) :
QPushButton(parent),
color_manager_(color_manager)
{
color_ = Color(1.0f, 1.0f, 1.0f);
@@ -14,7 +15,7 @@ ColorButton::ColorButton(QWidget *parent) :
void ColorButton::ShowColorDialog()
{
ColorDialog cd(nullptr, color_, this);
ColorDialog cd(color_manager_, color_, this);
if (cd.exec() == QDialog::Accepted) {
color_ = cd.GetSelectedColor();
+4 -1
View File
@@ -4,12 +4,13 @@
#include <QPushButton>
#include "render/color.h"
#include "render/colormanager.h"
class ColorButton : public QPushButton
{
Q_OBJECT
public:
ColorButton(QWidget* parent = nullptr);
ColorButton(ColorManager* color_manager, QWidget* parent = nullptr);
signals:
void ColorChanged();
@@ -20,6 +21,8 @@ private slots:
private:
void UpdateColor();
ColorManager* color_manager_;
Color color_;
};