diff options
author | Marco Bubke <marco.bubke@digia.com> | 2014-07-07 12:01:24 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-07-07 16:09:35 +0200 |
commit | b4e251fdad4b9aa779207aac3f30a55504e44edd (patch) | |
tree | 796f743b8554631d65baaa7a0f1722c32fcb4005 /share | |
parent | c1691a759048c53dc0e275bbafff2887604e89a5 (diff) | |
download | qt-creator-b4e251fdad4b9aa779207aac3f30a55504e44edd.tar.gz |
QmlDesigner: Improve style of states editor
Change-Id: Icbe8a6cb4713ec23bd7eb8ed7e9bec862822716c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml | 8 | ||||
-rw-r--r-- | share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml | 26 |
2 files changed, 7 insertions, 27 deletions
diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 6da0137ed6..81ff0cd0a4 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -41,10 +41,10 @@ Rectangle { property int delegateStateImageSize gradient: Gradient { - GradientStop { position: 0.0; color: Qt.lighter(gradiantBaseColor, 1.1) } - GradientStop { position: 0.2; color: Qt.lighter(gradiantBaseColor, 1.2) } - GradientStop { position: 0.3; color: Qt.lighter(gradiantBaseColor, 1.1) } - GradientStop { position: 1.0; color: gradiantBaseColor } + GradientStop { position: 0.0; color: Qt.lighter(gradiantBaseColor, 1.5) } + GradientStop { position: 0.1; color: Qt.lighter(gradiantBaseColor, 1) } + GradientStop { position: 0.8; color: gradiantBaseColor } + GradientStop { position: 1.0; color: Qt.darker(gradiantBaseColor) } } MouseArea { diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml index 3b4033da7d..82130cb0c0 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml @@ -35,7 +35,7 @@ import "../common" FocusScope { id: root - height: expanded ? 132 : 32 + height: expanded ? 136 : 32 signal createNewState signal deleteState(int internalNodeId) signal duplicateCurrentState @@ -44,7 +44,7 @@ FocusScope { property int delegateWidth: stateImageSize + 10 property int padding: 2 property int delegateHeight: root.height - padding * 2 - property int innerSpacing: 2 + property int innerSpacing: -1 property int currentStateInternalId : 0 property bool expanded: true @@ -91,23 +91,13 @@ FocusScope { Item { id: addStateItem - property int buttonLeftSpacing: innerSpacing + property int buttonLeftSpacing: 0 anchors.right: parent.right width: delegateHeight / 2 + buttonLeftSpacing height: delegateHeight Button { - style: ButtonStyle { - background: Rectangle { - implicitWidth: 100 - implicitHeight: 25 - color: control.hovered ? "#6f6f6f" : "#4f4f4f" - - border.color: "black" - } - } - id: addStateButton visible: canAddNewStates @@ -150,16 +140,6 @@ FocusScope { delegateStateImageSource: stateImageSource delegateStateImageSize: stateImageSize } - Rectangle { - /* Rectangle at the bottom using the highlight color */ - anchors.bottom: parent.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.leftMargin: 1 - anchors.rightMargin: 1 - height: 4 - color: Qt.darker(highlightColor, 1.2) - } } } } |