fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-01-09 04:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add color update when selecting button to edit

Browse Source
This commit is contained in:
lupoDharkael
2017-06-13 16:35:44 +02:00
parent eecbf33a49
commit 878640bf53
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/config/uicoloreditor.cpp
View File

@@ -16,7 +16,6 @@
// along with Flameshot. If not, see <http://www.gnu.org/licenses/>.
#include "uicoloreditor.h"
#include "color_wheel.hpp"
#include "src/capture/button.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
@@ -54,22 +53,22 @@ void UIcolorEditor::updateLocalColor(const QColor c) {
}
void UIcolorEditor::initColorWheel() {
color_widgets::ColorWheel *colorWheel = new color_widgets::ColorWheel(this);
connect(colorWheel, &color_widgets::ColorWheel::mouseReleaseOnColor, this,
m_colorWheel = new color_widgets::ColorWheel(this);
connect(m_colorWheel, &color_widgets::ColorWheel::mouseReleaseOnColor, this,
&UIcolorEditor::updateUIcolor);
connect(colorWheel, &color_widgets::ColorWheel::colorChanged, this,
connect(m_colorWheel, &color_widgets::ColorWheel::colorChanged, this,
&UIcolorEditor::updateLocalColor);
QSettings settings;
m_uiColor = settings.value("uiColor").value<QColor>();
colorWheel->setColor(m_uiColor);
colorWheel->setFixedSize(100,100);
m_colorWheel->setColor(m_uiColor);
m_colorWheel->setFixedSize(100,100);
colorWheel->setToolTip(tr("Change the color moving the selectors and see"
m_colorWheel->setToolTip(tr("Change the color moving the selectors and see"
" the changes in the preview buttons."));
hLayout->addWidget(colorWheel);
hLayout->addWidget(m_colorWheel);
}
void UIcolorEditor::initButtons() {
@@ -125,5 +124,11 @@ void UIcolorEditor::updateButtonIcon() {
}
void UIcolorEditor::changeLastButton(Button *b) {
m_lastButtonPressed = b;
if (m_lastButtonPressed != b) {
m_lastButtonPressed = b;
QString type = b == m_buttonMainColor ? "uiColor" : "contastUiColor";
QColor c = QSettings().value(type).value<QColor>();
m_colorWheel->setColor(c);
}
}

2
src/config/uicoloreditor.h
View File

@@ -18,6 +18,7 @@
#ifndef UICOLORPICKER_H
#define UICOLORPICKER_H
#include "color_wheel.hpp"
#include <QFrame>
class QVBoxLayout;
@@ -40,6 +41,7 @@ private:
Button *m_buttonMainColor;
Button *m_buttonContrast;
Button *m_lastButtonPressed;
color_widgets::ColorWheel *m_colorWheel;
QHBoxLayout *hLayout;
QVBoxLayout *vLayout;