aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2022-09-23 14:39:09 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2022-09-23 12:42:54 +0000
commit5b0bb021152f7e414d22d344b23bce07df29e859 (patch)
tree65ca899bed739f05319bdaedb5e65d910ee35779
parentc909e791d656be5f777dd58d7cc97316b8b63051 (diff)
QmlDesigner: Fix ColorDialog popup
Change-Id: I7f8daa6e9b26ae8244de1f7ab7c7db1dfa9b7e52 Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml9
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml9
2 files changed, 9 insertions, 9 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
index 471d2a4e61..b77addd7da 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
@@ -288,15 +288,6 @@ SecondColumnLayout {
id: spacer
}
- StudioControls.Menu {
- id: contextMenu
-
- StudioControls.MenuItem {
- text: qsTr("Open Color Dialog")
- onTriggered: colorPalette.showColorDialog(colorEditor.color)
- }
- }
-
Component.onCompleted: popupLoader.determineActiveColorMode()
onBackendValueChanged: {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
index 34574ec728..c7b260f124 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
@@ -200,6 +200,15 @@ T.Popup {
}
}
+ StudioControls.Menu {
+ id: contextMenu
+
+ StudioControls.MenuItem {
+ text: qsTr("Open Color Dialog")
+ onTriggered: colorPalette.showColorDialog(colorEditor.color)
+ }
+ }
+
GradientModel {
id: gradientModel
anchorBackendProperty: anchorBackend