diff options
author | Aleksei German <aleksei.german@qt.io> | 2019-06-07 16:31:46 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-06-07 14:42:00 +0000 |
commit | 469647db3dd091c5a617e15b0bb676a911102038 (patch) | |
tree | d87319b8a9da538132e195a9974dc2af105c3ee3 /share/qtcreator/qmldesigner | |
parent | f3c2fcef1aff0835b8e7887c59d54c48e1346ef8 (diff) | |
download | qt-creator-469647db3dd091c5a617e15b0bb676a911102038.tar.gz |
QmlDesigner ColorPalette StudioControls usage
Change-Id: Ia1c2daa693e9c2c2a2808cf6fab65a2b60014456
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share/qtcreator/qmldesigner')
-rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml index c6b6acf242..9cc787bd23 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml @@ -25,6 +25,7 @@ import QtQuick 2.1 import QtQuick.Controls 2.5 +import StudioControls 1.0 as StudioControls import HelperWidgets 2.0 import QtQuick.Controls.Private 1.0 // showing a ToolTip @@ -79,11 +80,9 @@ Item { contextMenu.popup() } } - Menu { + StudioControls.Menu { id: contextMenu - modal: true - closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape - MenuItem { + StudioControls.MenuItem { text: (backgroundColor.favorite ? qsTr("Remove from Favorites") : qsTr("Add to Favorites")) @@ -91,10 +90,6 @@ Item { paletteModel.toggleFavorite(index) } } - - Overlay.modal: Rectangle { - color: "transparent" - } } } } |