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

QmlDesigner: fix state controls highlight and selection

Browse Source 
Change-Id: I4101c6cd2d9028579bdae3710f36e6a3e254b53d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Brook Cronin
2023-02-07 17:10:37 +01:00
parent 5e70a0e374
commit c2af166e2a
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml
View File

@@ -41,7 +41,7 @@ T.ScrollBar {
radius: width / 2 radius: width / 2
opacity: 0.0 opacity: 0.0
color: scrollBar.pressed ? StudioTheme.Values.themeScrollBarHandle //"#4C4C4C"//DARK color: scrollBar.pressed ? StudioTheme.Values.themeScrollBarHandle //"#4C4C4C"//DARK
: StudioTheme.Values.themeScrollBarTrack //"#3E3E3E"//DARK : StudioTheme.Values.themeScrollBarHandle //"#3E3E3E"//DARK
states: State { states: State {
name: "active" name: "active"

18
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatesControlStyle.qml
View File

@@ -11,13 +11,23 @@ ControlStyle {
background: ControlStyle.BackgroundColors { background: ControlStyle.BackgroundColors {
idle: Values.themeToolbarBackground idle: Values.themeToolbarBackground
hover: Values.themeStateControlBackgroundColor_hover hover: Values.themeStateControlBackgroundColor_globalHover
globalHover: Values.themeStateControlBackgroundColor_globalHover globalHover: Values.themeStateControlBackgroundColor_globalHover
interaction: Values.themeInteraction interaction: Values.themeToolbarBackground
}
text: ControlStyle.TextColors {
idle: Values.themeTextColor
interaction: Values.themeTextSelectedTextColor
hover: Values.themeTextColor
disabled: Values.themeTextColorDisabled
selection: Values.themeTextSelectionColor
selectedText: Values.themeTextSelectedTextColor
placeholder: Values.themeTextColor
placeholderInteraction: Values.themeTextColor
} }
border: ControlStyle.BorderColors { border: ControlStyle.BorderColors {
hover: Values.themeControlBackground_toolbarHover idle: Values.controlOutline_toolbarIdle
hover: Values.themeStateHighlight
interaction: Values.themeInteraction interaction: Values.themeInteraction
} }
} }

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

@@ -358,6 +358,7 @@ QtObject {
property color themeTabInactiveBackground: Theme.color(Theme.DStabInactiveBackground) property color themeTabInactiveBackground: Theme.color(Theme.DStabInactiveBackground)
property color themeTabInactiveText: Theme.color(Theme.DStabInactiveText) property color themeTabInactiveText: Theme.color(Theme.DStabInactiveText)
// State Editor // State Editor
property color themeStateSeparator: Theme.color(Theme.DSstateSeparatorColor) property color themeStateSeparator: Theme.color(Theme.DSstateSeparatorColor)
property color themeStateBackground: Theme.color(Theme.DSstateBackgroundColor) property color themeStateBackground: Theme.color(Theme.DSstateBackgroundColor)

2
share/qtcreator/themes/default.creatortheme
View File

@@ -142,7 +142,7 @@ DSstateBackgroundColor=ffe0e0e0
DSstatePreviewOutline=ff363636 DSstatePreviewOutline=ff363636
DSstatePanelBackground=ffdadada DSstatePanelBackground=ffdadada
DSstateHighlight=ff8d8d8d DSstateHighlight=offWhite
DSchangedStateText=ff99ccff DSchangedStateText=ff99ccff