feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not update control values when pressing cancel

Browse Source 
Change-Id: I3d365e760fa8ba4a0b36a995d0bf6a59f2d9734b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2022-08-18 13:13:09 +02:00
parent dc2cd9db94
commit 5c68fb68ce
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/curveeditor/detail/colorcontrol.cpp
View File

@@ -85,7 +85,7 @@ void ColorControl::mouseReleaseEvent(QMouseEvent *event)
event->accept(); event->accept();
if (color != m_color) { if (color.isValid() && color != m_color) {
m_color = color; m_color = color;
update(); update();
emit valueChanged(); emit valueChanged();

4
src/plugins/qmldesigner/components/timelineeditor/setframevaluedialog.cpp
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "setframevaluedialog.h" #include "setframevaluedialog.h"
#include "curveeditor/detail/colorcontrol.h" #include "timelinecontrols.h"
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include <QSpinBox> #include <QSpinBox>
@@ -110,7 +110,7 @@ QWidget* SetFrameValueDialog::createValueControl(const QVariant& value)
{ {
case QMetaType::QColor: { case QMetaType::QColor: {
auto* widget = new StyleEditor::ColorControl(value.value<QColor>()); auto* widget = new ColorControl(value.value<QColor>());
m_valueGetter = [widget]() { return widget->value(); }; m_valueGetter = [widget]() { return widget->value(); };
return widget; return widget;
} }

2
src/plugins/qmldesigner/components/timelineeditor/timelinecontrols.cpp
View File

@@ -191,7 +191,7 @@ void ColorControl::mouseReleaseEvent(QMouseEvent *event)
event->accept(); event->accept();
if (color != m_color) { if (color.isValid() && color != m_color) {
m_color = color; m_color = color;
update(); update();
emit valueChanged(); emit valueChanged();