diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-07-26 14:25:03 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-07-26 13:02:22 +0000 |
| commit | 8f5059946261746880c4c6c3f2d826552e72412d (patch) | |
| tree | 789b06b5a67c71b2c54c07bb794ae9c87b853b07 /share | |
| parent | 9d5705a755d747560440092747a9025c12ba7a72 (diff) | |
| download | qt-creator-8f5059946261746880c4c6c3f2d826552e72412d.tar.gz | |
QmlDesigner: Use QmlDesigner_HighlightColor consistently
This fixes a couple of issue in the .css and we
always use the same highlight color (QmlDesigner_HighlightColor).
Change-Id: I6522eabc00c30399b2c3b2689256b970ec558719
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml | 3 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index 6e13ae4934..07944f7699 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -101,9 +101,6 @@ Rectangle { statesEditorModel.renameState(internalNodeId, text) } - // as we change the background we need to change the text - // color to see some text - textColor: creatorTheme.PanelTextColorLight } Item { diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml index 1f3fca6e10..57f7efe365 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml @@ -147,7 +147,7 @@ FocusScope { height: delegateHeight isBaseState: 0 == internalNodeId isCurrentState: root.currentStateInternalId == internalNodeId - baseColor: isCurrentState ? Qt.darker(highlightColor, 1.2) : background.color + baseColor: isCurrentState ? creatorTheme.QmlDesigner_HighlightColor : background.color delegateStateName: stateName delegateStateImageSource: stateImageSource delegateStateImageSize: stateImageSize |