change: change code style to Linux style except indent.
This commit is contained in:
@@ -22,76 +22,82 @@
|
||||
|
||||
#include "dialog/color/colordialog.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
ColorButton::ColorButton(ColorManager* color_manager, bool show_dialog_on_click, QWidget *parent) :
|
||||
QPushButton(parent),
|
||||
color_manager_(color_manager),
|
||||
color_processor_(nullptr),
|
||||
dialog_open_(false)
|
||||
namespace olive
|
||||
{
|
||||
setAutoFillBackground(true);
|
||||
|
||||
if (show_dialog_on_click) {
|
||||
connect(this, &ColorButton::clicked, this, &ColorButton::ShowColorDialog);
|
||||
}
|
||||
ColorButton::ColorButton(ColorManager *color_manager, bool show_dialog_on_click,
|
||||
QWidget *parent)
|
||||
: QPushButton(parent)
|
||||
, color_manager_(color_manager)
|
||||
, color_processor_(nullptr)
|
||||
, dialog_open_(false)
|
||||
{
|
||||
setAutoFillBackground(true);
|
||||
|
||||
SetColor(Color(1.0f, 1.0f, 1.0f));
|
||||
if (show_dialog_on_click) {
|
||||
connect(this, &ColorButton::clicked, this,
|
||||
&ColorButton::ShowColorDialog);
|
||||
}
|
||||
|
||||
SetColor(Color(1.0f, 1.0f, 1.0f));
|
||||
}
|
||||
|
||||
const ManagedColor &ColorButton::GetColor() const
|
||||
{
|
||||
return color_;
|
||||
return color_;
|
||||
}
|
||||
|
||||
void ColorButton::SetColor(const ManagedColor &c)
|
||||
{
|
||||
color_ = c;
|
||||
color_ = c;
|
||||
|
||||
color_.set_color_input(color_manager_->GetCompliantColorSpace(color_.color_input()));
|
||||
color_.set_color_output(color_manager_->GetCompliantColorSpace(color_.color_output()));
|
||||
color_.set_color_input(
|
||||
color_manager_->GetCompliantColorSpace(color_.color_input()));
|
||||
color_.set_color_output(
|
||||
color_manager_->GetCompliantColorSpace(color_.color_output()));
|
||||
|
||||
UpdateColor();
|
||||
UpdateColor();
|
||||
}
|
||||
|
||||
void ColorButton::ShowColorDialog()
|
||||
{
|
||||
if (!dialog_open_) {
|
||||
dialog_open_ = true;
|
||||
ColorDialog *cd = new ColorDialog(color_manager_, color_, this);
|
||||
if (!dialog_open_) {
|
||||
dialog_open_ = true;
|
||||
ColorDialog *cd = new ColorDialog(color_manager_, color_, this);
|
||||
|
||||
connect(cd, &ColorDialog::finished, this, &ColorButton::ColorDialogFinished);
|
||||
connect(cd, &ColorDialog::finished, this,
|
||||
&ColorButton::ColorDialogFinished);
|
||||
|
||||
cd->show();
|
||||
}
|
||||
cd->show();
|
||||
}
|
||||
}
|
||||
|
||||
void ColorButton::ColorDialogFinished(int e)
|
||||
{
|
||||
ColorDialog *cd = static_cast<ColorDialog*>(sender());
|
||||
ColorDialog *cd = static_cast<ColorDialog *>(sender());
|
||||
|
||||
if (e == QDialog::Accepted) {
|
||||
color_ = cd->GetSelectedColor();
|
||||
if (e == QDialog::Accepted) {
|
||||
color_ = cd->GetSelectedColor();
|
||||
|
||||
UpdateColor();
|
||||
UpdateColor();
|
||||
|
||||
emit ColorChanged(color_);
|
||||
}
|
||||
emit ColorChanged(color_);
|
||||
}
|
||||
|
||||
cd->deleteLater();
|
||||
cd->deleteLater();
|
||||
|
||||
dialog_open_ = false;
|
||||
dialog_open_ = false;
|
||||
}
|
||||
|
||||
void ColorButton::UpdateColor()
|
||||
{
|
||||
color_processor_ = ColorProcessor::Create(color_manager_,
|
||||
color_.color_input(),
|
||||
color_.color_output());
|
||||
color_processor_ = ColorProcessor::Create(
|
||||
color_manager_, color_.color_input(), color_.color_output());
|
||||
|
||||
QColor managed = QtUtils::toQColor(color_processor_->ConvertColor(color_));
|
||||
QColor managed = QtUtils::toQColor(color_processor_->ConvertColor(color_));
|
||||
|
||||
setStyleSheet(QStringLiteral("%1--ColorButton {background: %2;}").arg(MACRO_VAL_AS_STR(olive), managed.name()));
|
||||
setStyleSheet(QStringLiteral("%1--ColorButton {background: %2;}")
|
||||
.arg(MACRO_VAL_AS_STR(olive), managed.name()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -26,42 +26,42 @@
|
||||
#include "node/color/colormanager/colormanager.h"
|
||||
#include "render/managedcolor.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
class ColorButton : public QPushButton
|
||||
namespace olive
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
ColorButton(ColorManager* color_manager, bool show_dialog_on_click, QWidget* parent = nullptr);
|
||||
ColorButton(ColorManager* color_manager, QWidget* parent = nullptr) :
|
||||
ColorButton(color_manager, true, parent)
|
||||
{
|
||||
}
|
||||
|
||||
const ManagedColor& GetColor() const;
|
||||
class ColorButton : public QPushButton {
|
||||
Q_OBJECT
|
||||
public:
|
||||
ColorButton(ColorManager *color_manager, bool show_dialog_on_click,
|
||||
QWidget *parent = nullptr);
|
||||
ColorButton(ColorManager *color_manager, QWidget *parent = nullptr)
|
||||
: ColorButton(color_manager, true, parent)
|
||||
{
|
||||
}
|
||||
|
||||
const ManagedColor &GetColor() const;
|
||||
|
||||
public slots:
|
||||
void SetColor(const ManagedColor& c);
|
||||
void SetColor(const ManagedColor &c);
|
||||
|
||||
signals:
|
||||
void ColorChanged(const ManagedColor& c);
|
||||
void ColorChanged(const ManagedColor &c);
|
||||
|
||||
private slots:
|
||||
void ShowColorDialog();
|
||||
void ShowColorDialog();
|
||||
|
||||
void ColorDialogFinished(int e);
|
||||
void ColorDialogFinished(int e);
|
||||
|
||||
private:
|
||||
void UpdateColor();
|
||||
void UpdateColor();
|
||||
|
||||
ColorManager* color_manager_;
|
||||
ColorManager *color_manager_;
|
||||
|
||||
ManagedColor color_;
|
||||
ManagedColor color_;
|
||||
|
||||
ColorProcessorPtr color_processor_;
|
||||
|
||||
bool dialog_open_;
|
||||
ColorProcessorPtr color_processor_;
|
||||
|
||||
bool dialog_open_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user