Code refactoring - change code style to the new clang-format rules
This commit is contained in:
@@ -16,50 +16,55 @@
|
||||
// along with Flameshot. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "sidepanelwidget.h"
|
||||
#include "src/utils/pathinfo.h"
|
||||
#include "src/utils/colorutils.h"
|
||||
#include <QVBoxLayout>
|
||||
#include "src/utils/pathinfo.h"
|
||||
#include <QFormLayout>
|
||||
#include <QPushButton>
|
||||
#include <QLabel>
|
||||
#include <QKeyEvent>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
#include <QSlider>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
class QColorPickingEventFilter : public QObject {
|
||||
class QColorPickingEventFilter : public QObject
|
||||
{
|
||||
public:
|
||||
explicit QColorPickingEventFilter(SidePanelWidget* pw,
|
||||
QObject* parent = nullptr)
|
||||
: QObject(parent)
|
||||
, m_pw(pw)
|
||||
{}
|
||||
|
||||
explicit QColorPickingEventFilter(
|
||||
SidePanelWidget *pw, QObject *parent = nullptr) :
|
||||
QObject(parent), m_pw(pw) {}
|
||||
|
||||
bool eventFilter(QObject *, QEvent *event) override {
|
||||
bool eventFilter(QObject*, QEvent* event) override
|
||||
{
|
||||
event->accept();
|
||||
switch (event->type()) {
|
||||
case QEvent::MouseMove:
|
||||
return m_pw->handleMouseMove(static_cast<QMouseEvent *>(event));
|
||||
case QEvent::MouseButtonPress:
|
||||
return m_pw->handleMouseButtonPressed(
|
||||
static_cast<QMouseEvent *>(event));
|
||||
case QEvent::KeyPress:
|
||||
return m_pw->handleKeyPress(static_cast<QKeyEvent *>(event));
|
||||
default:
|
||||
break;
|
||||
case QEvent::MouseMove:
|
||||
return m_pw->handleMouseMove(static_cast<QMouseEvent*>(event));
|
||||
case QEvent::MouseButtonPress:
|
||||
return m_pw->handleMouseButtonPressed(
|
||||
static_cast<QMouseEvent*>(event));
|
||||
case QEvent::KeyPress:
|
||||
return m_pw->handleKeyPress(static_cast<QKeyEvent*>(event));
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private:
|
||||
SidePanelWidget *m_pw;
|
||||
SidePanelWidget* m_pw;
|
||||
};
|
||||
|
||||
////////////////////////
|
||||
|
||||
SidePanelWidget::SidePanelWidget(QPixmap *p, QWidget *parent) :
|
||||
QWidget(parent), m_pixmap(p), m_eventFilter(nullptr)
|
||||
SidePanelWidget::SidePanelWidget(QPixmap* p, QWidget* parent)
|
||||
: QWidget(parent)
|
||||
, m_pixmap(p)
|
||||
, m_eventFilter(nullptr)
|
||||
{
|
||||
m_layout = new QVBoxLayout(this);
|
||||
|
||||
QFormLayout *colorForm = new QFormLayout();
|
||||
QFormLayout* colorForm = new QFormLayout();
|
||||
m_thicknessSlider = new QSlider(Qt::Horizontal);
|
||||
m_thicknessSlider->setValue(m_thickness);
|
||||
m_colorLabel = new QLabel();
|
||||
@@ -68,48 +73,60 @@ SidePanelWidget::SidePanelWidget(QPixmap *p, QWidget *parent) :
|
||||
colorForm->addRow(tr("Active color:"), m_colorLabel);
|
||||
m_layout->addLayout(colorForm);
|
||||
|
||||
connect(m_thicknessSlider, &QSlider::sliderReleased,
|
||||
this, &SidePanelWidget::updateCurrentThickness);
|
||||
connect(this, &SidePanelWidget::thicknessChanged,
|
||||
this, &SidePanelWidget::updateThickness);
|
||||
connect(m_thicknessSlider,
|
||||
&QSlider::sliderReleased,
|
||||
this,
|
||||
&SidePanelWidget::updateCurrentThickness);
|
||||
connect(this,
|
||||
&SidePanelWidget::thicknessChanged,
|
||||
this,
|
||||
&SidePanelWidget::updateThickness);
|
||||
|
||||
QColor background = this->palette().background().color();
|
||||
bool isDark = ColorUtils::colorIsDark(background);
|
||||
QString modifier = isDark ? PathInfo::whiteIconPath() :
|
||||
PathInfo::blackIconPath();
|
||||
QString modifier =
|
||||
isDark ? PathInfo::whiteIconPath() : PathInfo::blackIconPath();
|
||||
QIcon grabIcon(modifier + "colorize.svg");
|
||||
m_colorGrabButton = new QPushButton(grabIcon, QLatin1String(""));
|
||||
updateGrabButton(false);
|
||||
connect(m_colorGrabButton, &QPushButton::pressed,
|
||||
this, &SidePanelWidget::colorGrabberActivated);
|
||||
connect(m_colorGrabButton,
|
||||
&QPushButton::pressed,
|
||||
this,
|
||||
&SidePanelWidget::colorGrabberActivated);
|
||||
m_layout->addWidget(m_colorGrabButton);
|
||||
|
||||
m_colorWheel = new color_widgets::ColorWheel(this);
|
||||
m_colorWheel->setColor(m_color);
|
||||
connect(m_colorWheel, &color_widgets::ColorWheel::mouseReleaseOnColor, this,
|
||||
connect(m_colorWheel,
|
||||
&color_widgets::ColorWheel::mouseReleaseOnColor,
|
||||
this,
|
||||
&SidePanelWidget::colorChanged);
|
||||
connect(m_colorWheel, &color_widgets::ColorWheel::colorChanged, this,
|
||||
connect(m_colorWheel,
|
||||
&color_widgets::ColorWheel::colorChanged,
|
||||
this,
|
||||
&SidePanelWidget::updateColorNoWheel);
|
||||
m_layout->addWidget(m_colorWheel);
|
||||
}
|
||||
|
||||
void SidePanelWidget::updateColor(const QColor &c) {
|
||||
void SidePanelWidget::updateColor(const QColor& c)
|
||||
{
|
||||
m_color = c;
|
||||
m_colorLabel->setStyleSheet(
|
||||
QStringLiteral("QLabel { background-color : %1; }").arg(c.name()));
|
||||
QStringLiteral("QLabel { background-color : %1; }").arg(c.name()));
|
||||
m_colorWheel->setColor(m_color);
|
||||
}
|
||||
|
||||
void SidePanelWidget::updateThickness(const int &t)
|
||||
void SidePanelWidget::updateThickness(const int& t)
|
||||
{
|
||||
m_thickness = qBound(0, t, 100);
|
||||
m_thicknessSlider->setValue(m_thickness);
|
||||
}
|
||||
|
||||
void SidePanelWidget::updateColorNoWheel(const QColor &c) {
|
||||
void SidePanelWidget::updateColorNoWheel(const QColor& c)
|
||||
{
|
||||
m_color = c;
|
||||
m_colorLabel->setStyleSheet(
|
||||
QStringLiteral("QLabel { background-color : %1; }").arg(c.name()));
|
||||
QStringLiteral("QLabel { background-color : %1; }").arg(c.name()));
|
||||
}
|
||||
|
||||
void SidePanelWidget::updateCurrentThickness()
|
||||
@@ -117,7 +134,8 @@ void SidePanelWidget::updateCurrentThickness()
|
||||
emit thicknessChanged(m_thicknessSlider->value());
|
||||
}
|
||||
|
||||
void SidePanelWidget::colorGrabberActivated() {
|
||||
void SidePanelWidget::colorGrabberActivated()
|
||||
{
|
||||
grabKeyboard();
|
||||
grabMouse(Qt::CrossCursor);
|
||||
setMouseTracking(true);
|
||||
@@ -129,7 +147,8 @@ void SidePanelWidget::colorGrabberActivated() {
|
||||
updateGrabButton(true);
|
||||
}
|
||||
|
||||
void SidePanelWidget::releaseColorGrab() {
|
||||
void SidePanelWidget::releaseColorGrab()
|
||||
{
|
||||
setMouseTracking(false);
|
||||
removeEventFilter(m_eventFilter);
|
||||
releaseMouse();
|
||||
@@ -138,16 +157,18 @@ void SidePanelWidget::releaseColorGrab() {
|
||||
updateGrabButton(false);
|
||||
}
|
||||
|
||||
QColor SidePanelWidget::grabPixmapColor(const QPoint &p) {
|
||||
QColor SidePanelWidget::grabPixmapColor(const QPoint& p)
|
||||
{
|
||||
QColor c;
|
||||
if (m_pixmap) {
|
||||
QPixmap pixel = m_pixmap->copy(QRect(p, p));
|
||||
c = pixel.toImage().pixel(0,0);
|
||||
c = pixel.toImage().pixel(0, 0);
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
bool SidePanelWidget::handleKeyPress(QKeyEvent *e) {
|
||||
bool SidePanelWidget::handleKeyPress(QKeyEvent* e)
|
||||
{
|
||||
if (e->key() == Qt::Key_Escape) {
|
||||
releaseColorGrab();
|
||||
updateColor(m_colorBackup);
|
||||
@@ -159,10 +180,10 @@ bool SidePanelWidget::handleKeyPress(QKeyEvent *e) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SidePanelWidget::handleMouseButtonPressed(QMouseEvent *e) {
|
||||
bool SidePanelWidget::handleMouseButtonPressed(QMouseEvent* e)
|
||||
{
|
||||
if (m_colorGrabButton->geometry().contains(e->pos()) ||
|
||||
e->button() == Qt::RightButton)
|
||||
{
|
||||
e->button() == Qt::RightButton) {
|
||||
updateColorNoWheel(m_colorBackup);
|
||||
} else if (e->button() == Qt::LeftButton) {
|
||||
updateColor(grabPixmapColor(QCursor::pos()));
|
||||
@@ -172,12 +193,14 @@ bool SidePanelWidget::handleMouseButtonPressed(QMouseEvent *e) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SidePanelWidget::handleMouseMove(QMouseEvent *e) {
|
||||
bool SidePanelWidget::handleMouseMove(QMouseEvent* e)
|
||||
{
|
||||
updateColorNoWheel(grabPixmapColor(e->globalPos()));
|
||||
return true;
|
||||
}
|
||||
|
||||
void SidePanelWidget::updateGrabButton(const bool activated) {
|
||||
void SidePanelWidget::updateGrabButton(const bool activated)
|
||||
{
|
||||
if (activated) {
|
||||
m_colorGrabButton->setText(tr("Press ESC to cancel"));
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user