summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-06-20 10:33:30 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-06-20 13:57:31 +0000
commitcf53aa21bf0f8fbd13c0ce2d33ddf7bc63d0d76a (patch)
treece58402029cda80980f580b360a8d0dc3c8796b8 /src/plugins
parentd23c2e005ff525e2274f871ac9433c04cda9f849 (diff)
QGtk3ColorDialogHelper: ensure currentColorChanged() gets emitted
GTK does not emit the "color-activated" signal as expected, so make sure currentColorChanged() gets emitted the same way it's done for QGtk3FontDialogHelper. This ensures that QML bindings get re-evaluated as appropriate. Change-Id: Id00f144e8b9a08afee57ef6a6033972cdc4307b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
index a21b4d8a65..488ae16123 100644
--- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
@@ -215,8 +215,10 @@ QColor QGtk3ColorDialogHelper::currentColor() const
void QGtk3ColorDialogHelper::onAccepted()
{
+ const QColor color = currentColor();
+ emit currentColorChanged(color);
emit accept();
- emit colorSelected(currentColor());
+ emit colorSelected(color);
}
void QGtk3ColorDialogHelper::onColorChanged(QGtk3ColorDialogHelper *dialog)