diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-01-17 16:22:45 +0200 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-01-18 10:15:00 +0000 |
| commit | 54e7d41726d4fc755bd4d2c8074433d241127335 (patch) | |
| tree | de4b779967f28d0ddb657f6824eb72a7a1e2d3ba | |
| parent | f884ff2160ed5b3c44663d70e1c6915aff4b8ac0 (diff) | |
| download | qt-creator-54e7d41726d4fc755bd4d2c8074433d241127335.tar.gz | |
QmlDesigner/StateEditor: Remove default state's yellow highlight
Task-number: QDS-5973
Change-Id: Ie4b82bfbbb91a48152a969bb988220303854709d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml | 1 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml | 18 |
2 files changed, 7 insertions, 12 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 018187596b..5ba591c174 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -289,7 +289,6 @@ QtObject { property string themeTabInactiveBackground: Theme.color(Theme.DStabInactiveBackground) property string themeTabInactiveText: Theme.color(Theme.DStabInactiveText) - property string themeStateDefaultHighlight: Theme.color(Theme.DSstateDefaultHighlight) property string themeStateSeparator: Theme.color(Theme.DSstateSeparatorColor) property string themeStateBackground: Theme.color(Theme.DSstateBackgroundColor) property string themeStatePreviewOutline: Theme.color(Theme.DSstatePreviewOutline) diff --git a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml index faae1210b5..08a7bc7dc3 100644 --- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml +++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml @@ -53,7 +53,6 @@ Rectangle { property int closeButtonMargin: 6 property int textFieldMargin: 4 - property int highlightBorderWidth: 2 signal delegateInteraction @@ -165,21 +164,11 @@ Rectangle { } } - - Rectangle { // highlight for default state - anchors.margins: (isDefaultState || (isBaseState && !modelHasDefaultState)) ? -myRoot.highlightBorderWidth : 0 - anchors.fill: column - color: StudioTheme.Values.themeStateSeparator - border.color: StudioTheme.Values.themeStateDefaultHighlight - border.width: (isDefaultState || (isBaseState && !modelHasDefaultState)) ? myRoot.highlightBorderWidth : 0 - } - Column { id: column anchors.margins: myRoot.stateMargin anchors.fill: parent - spacing: expanded ? myRoot.columnSpacing : 0 Rectangle { width: myRoot.width - 2 * myRoot.stateMargin @@ -263,6 +252,13 @@ Rectangle { } } + Rectangle { // separator + width: column.width + height: myRoot.columnSpacing + color: StudioTheme.Values.themeStateSeparator + visible: expanded + } + Rectangle { id: stateImageArea width: myRoot.width - 2 * myRoot.stateMargin |