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

QmlDesigner/StateEditor: Remove default state's yellow highlight

Browse Source 
Task-number: QDS-5973
Change-Id: Ie4b82bfbbb91a48152a969bb988220303854709d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Mahmoud Badri
2022-01-17 16:22:45 +02:00
parent f884ff2160
commit 54e7d41726
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
View File

@@ -289,7 +289,6 @@ QtObject {
property string themeTabInactiveBackground: Theme.color(Theme.DStabInactiveBackground) property string themeTabInactiveBackground: Theme.color(Theme.DStabInactiveBackground)
property string themeTabInactiveText: Theme.color(Theme.DStabInactiveText) property string themeTabInactiveText: Theme.color(Theme.DStabInactiveText)
property string themeStateDefaultHighlight: Theme.color(Theme.DSstateDefaultHighlight)
property string themeStateSeparator: Theme.color(Theme.DSstateSeparatorColor) property string themeStateSeparator: Theme.color(Theme.DSstateSeparatorColor)
property string themeStateBackground: Theme.color(Theme.DSstateBackgroundColor) property string themeStateBackground: Theme.color(Theme.DSstateBackgroundColor)
property string themeStatePreviewOutline: Theme.color(Theme.DSstatePreviewOutline) property string themeStatePreviewOutline: Theme.color(Theme.DSstatePreviewOutline)

18
share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
View File

@@ -53,7 +53,6 @@ Rectangle {
property int closeButtonMargin: 6 property int closeButtonMargin: 6
property int textFieldMargin: 4 property int textFieldMargin: 4
property int highlightBorderWidth: 2
signal delegateInteraction 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 { Column {
id: column id: column
anchors.margins: myRoot.stateMargin anchors.margins: myRoot.stateMargin
anchors.fill: parent anchors.fill: parent
spacing: expanded ? myRoot.columnSpacing : 0
Rectangle { Rectangle {
width: myRoot.width - 2 * myRoot.stateMargin 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 { Rectangle {
id: stateImageArea id: stateImageArea
width: myRoot.width - 2 * myRoot.stateMargin width: myRoot.width - 2 * myRoot.stateMargin