Skip to content

Commit cd80260

Browse files
remove color set on widget hide (flameshot-org#4226)
1 parent cffc66a commit cd80260

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/widgets/capture/capturewidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,7 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent* e)
981981
m_context.color.isValid()) {
982982
pushObjectsStateToUndoStack();
983983
}
984+
m_colorPicker->setNewColor();
984985
m_colorPicker->hide();
985986
if (!m_context.color.isValid()) {
986987
m_context.color = ConfigHandler().drawColor();

src/widgets/capture/colorpicker.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ ColorPicker::ColorPicker(QWidget* parent)
2222
}
2323
}
2424
}
25+
void ColorPicker::setNewColor()
26+
{
27+
emit colorSelected(m_colorList.at(m_selectedIndex));
28+
}
2529

2630
void ColorPicker::mouseMoveEvent(QMouseEvent* e)
2731
{
@@ -44,5 +48,4 @@ void ColorPicker::showEvent(QShowEvent* event)
4448
void ColorPicker::hideEvent(QHideEvent* event)
4549
{
4650
releaseMouse();
47-
emit colorSelected(m_colorList.at(m_selectedIndex));
4851
}

src/widgets/capture/colorpicker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class ColorPicker : public ColorPickerWidget
1010
Q_OBJECT
1111
public:
1212
explicit ColorPicker(QWidget* parent = nullptr);
13-
13+
void setNewColor();
1414
signals:
1515
void colorSelected(QColor c);
1616

0 commit comments

Comments
 (0)