summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-20 17:52:43 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-09-20 17:54:53 +0200
commita2511021c29df653ef0a58b96d3a08496b1d35d0 (patch)
tree6f929ef9b289ccd4c51e211f45c22624f286155c
parent6a9cbb257a5621e86362626392318295421b5a32 (diff)
downloadqt-creator-a2511021c29df653ef0a58b96d3a08496b1d35d0.tar.gz
QmlDesigner.PropertyEditor: fix color editing in RectangleSpecifics
Change-Id: I9c504f708e0d52fce2cb7c6fa3fe1b021c257435 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml34
1 files changed, 17 insertions, 17 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
index b73e71ffc1..7ac6bdbbf9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
@@ -39,30 +39,30 @@ Column {
Section {
anchors.left: parent.left
anchors.right: parent.right
- caption: "Color"
+ caption: qsTr("Color")
ColorEditor {
- id: colorEditor
- color: backendValues.color.value
- onColorChanged: {
- //backendValues.color.value = color
- //Delay setting the color to keep ui responsive
- colorEditorTimer.restart()
- }
+ caption: qsTr("Color")
+ backendendValue: backendValues.color
+ supportGradient: true
+ }
- Timer {
- id: colorEditorTimer
- repeat: false
- interval: 100
- onTriggered: {
- backendValues.color.value = colorEditor.color
- }
- }
- }
+ }
+ Section {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ caption: qsTr("Border Color")
+
+ ColorEditor {
+ caption: qsTr("Border Color")
+ backendendValue: backendValues.border_color
+ supportGradient: false
+ }
}
+
Section {
anchors.left: parent.left
anchors.right: parent.right