QmlDesigner: fix state controls highlight and selection

Change-Id: I4101c6cd2d9028579bdae3710f36e6a3e254b53d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>

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"

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
     }
 }

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)

share/qtcreator/themes/default.creatortheme

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