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

QmlDesigner ColorPalette StudioControls usage

Browse Source 
Change-Id: Ia1c2daa693e9c2c2a2808cf6fab65a2b60014456
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2019-06-07 16:31:46 +02:00
committed by Thomas Hartmann
parent f3c2fcef1a
commit 469647db3d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
View File

@@ -25,6 +25,7 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 2.5 import QtQuick.Controls 2.5
import StudioControls 1.0 as StudioControls
import HelperWidgets 2.0 import HelperWidgets 2.0
import QtQuick.Controls.Private 1.0 // showing a ToolTip import QtQuick.Controls.Private 1.0 // showing a ToolTip
@@ -79,11 +80,9 @@ Item {
contextMenu.popup() contextMenu.popup()
} }
} }
Menu { StudioControls.Menu {
id: contextMenu id: contextMenu
modal: true StudioControls.MenuItem {
closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
MenuItem {
text: (backgroundColor.favorite text: (backgroundColor.favorite
? qsTr("Remove from Favorites") ? qsTr("Remove from Favorites")
: qsTr("Add to Favorites")) : qsTr("Add to Favorites"))
@@ -91,10 +90,6 @@ Item {
paletteModel.toggleFavorite(index) paletteModel.toggleFavorite(index)
} }
} }
Overlay.modal: Rectangle {
color: "transparent"
}
} }
} }
} }