From c2af166e2aa0da123bc9a1293aaeffed91bd69de Mon Sep 17 00:00:00 2001 From: Brook Cronin Date: Tue, 7 Feb 2023 17:10:37 +0100 Subject: [PATCH] QmlDesigner: fix state controls highlight and selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4101c6cd2d9028579bdae3710f36e6a3e254b53d Reviewed-by: Thomas Hartmann Reviewed-by: Henning Gründl --- .../newstateseditor/StateScrollBar.qml | 2 +- .../imports/StudioTheme/StatesControlStyle.qml | 18 ++++++++++++++---- .../imports/StudioTheme/Values.qml | 1 + share/qtcreator/themes/default.creatortheme | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml b/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml index 1591d3ecb78..51e884aa5a3 100644 --- a/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml +++ b/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml @@ -41,7 +41,7 @@ T.ScrollBar { radius: width / 2 opacity: 0.0 color: scrollBar.pressed ? StudioTheme.Values.themeScrollBarHandle //"#4C4C4C"//DARK - : StudioTheme.Values.themeScrollBarTrack //"#3E3E3E"//DARK + : StudioTheme.Values.themeScrollBarHandle //"#3E3E3E"//DARK states: State { name: "active" diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatesControlStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatesControlStyle.qml index f15e8a6c55d..848d9f55c02 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatesControlStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatesControlStyle.qml @@ -11,13 +11,23 @@ ControlStyle { background: ControlStyle.BackgroundColors { idle: Values.themeToolbarBackground - hover: Values.themeStateControlBackgroundColor_hover + hover: 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 { - hover: Values.themeControlBackground_toolbarHover + idle: Values.controlOutline_toolbarIdle + hover: Values.themeStateHighlight interaction: Values.themeInteraction } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 426eff912ac..197d3c42fa7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -358,6 +358,7 @@ QtObject { property color themeTabInactiveBackground: Theme.color(Theme.DStabInactiveBackground) property color themeTabInactiveText: Theme.color(Theme.DStabInactiveText) + // State Editor property color themeStateSeparator: Theme.color(Theme.DSstateSeparatorColor) property color themeStateBackground: Theme.color(Theme.DSstateBackgroundColor) diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index b63d4276eec..fc4aa4ee8e1 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -142,7 +142,7 @@ DSstateBackgroundColor=ffe0e0e0 DSstatePreviewOutline=ff363636 DSstatePanelBackground=ffdadada -DSstateHighlight=ff8d8d8d +DSstateHighlight=offWhite DSchangedStateText=ff99ccff