diff options
| author | Brook Cronin <brook.cronin@qt.io> | 2022-09-22 12:59:39 +0200 |
|---|---|---|
| committer | Brook Cronin <brook.cronin@qt.io> | 2022-09-22 15:19:31 +0000 |
| commit | e28810b50c196cf1fd4035685f882ff02a504b09 (patch) | |
| tree | e264fae4e359baa591c72f8346d8eb680999f461 | |
| parent | 1664a5f4e245fcedc1f88eb7fe2d22241be9a308 (diff) | |
| download | qt-creator-e28810b50c196cf1fd4035685f882ff02a504b09.tar.gz | |
QmlDesigner: Fix Scrollbar size and colors
Task-number: QDS-7741
Change-Id: I013fcfe1c80ef637388af190d27c4954be650d86
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml | 10 | ||||
| -rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 4 | ||||
| -rw-r--r-- | share/qtcreator/themes/design.creatortheme | 4 | ||||
| -rw-r--r-- | share/qtcreator/themes/flat-dark.creatortheme | 4 | ||||
| -rw-r--r-- | share/qtcreator/themes/flat.creatortheme | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml b/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml index a284131bad..1591d3ecb7 100644 --- a/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml +++ b/share/qtcreator/qmldesigner/newstateseditor/StateScrollBar.qml @@ -36,19 +36,19 @@ T.ScrollBar { implicitContentHeight + topPadding + bottomPadding) contentItem: Rectangle { - implicitWidth: scrollBar.interactive ? 6 : 2 - implicitHeight: scrollBar.interactive ? 6 : 2 + implicitWidth: scrollBar.interactive ? 14 : 8 + implicitHeight: scrollBar.interactive ? 14 : 8 radius: width / 2 opacity: 0.0 - color: scrollBar.pressed ? StudioTheme.Values.themeSliderActiveTrackHover - : StudioTheme.Values.themeSliderHandle + color: scrollBar.pressed ? StudioTheme.Values.themeScrollBarHandle //"#4C4C4C"//DARK + : StudioTheme.Values.themeScrollBarTrack //"#3E3E3E"//DARK states: State { name: "active" when: scrollBar.active && scrollBar.size < 1.0 PropertyChanges { target: scrollBar.contentItem - opacity: 0.75 + opacity: 0.9 } } diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 7b124ca0d6..f6ca9944f3 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -84,8 +84,8 @@ DSsliderHandleHover=ff606060 DSsliderHandleFocus=ff0492c9 DSsliderHandleInteraction=ff2aafd3 -DSscrollBarTrack=ff404040 -DSscrollBarHandle=ff505050 +DSscrollBarTrack=ff3E3E3E +DSscrollBarHandle=ff4C4C4C DSsectionHeadBackground=ff1f1f1f diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 52132b189d..cc2fd4431f 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -86,8 +86,8 @@ DSsliderHandleHover=ff606060 DSsliderHandleFocus=ff0492c9 DSsliderHandleInteraction=ff2aafd3 -DSscrollBarTrack=ff404040 -DSscrollBarHandle=ff505050 +DSscrollBarTrack=ff3E3E3E +DSscrollBarHandle=ff4C4C4C DSsectionHeadBackground=ff1f1f1f diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index e67e0e1b9f..ad1ad7a9a1 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -88,8 +88,8 @@ DSsliderHandleHover=ff606060 DSsliderHandleFocus=ff0492c9 DSsliderHandleInteraction=ff2aafd3 -DSscrollBarTrack=ff404040 -DSscrollBarHandle=ff505050 +DSscrollBarTrack=ff3E3E3E +DSscrollBarHandle=ff4C4C4C DSsectionHeadBackground=ff1f1f1f diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index e100604879..8a16660243 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -82,8 +82,8 @@ DSsliderHandleHover=ff606060 DSsliderHandleFocus=ff0492c9 DSsliderHandleInteraction=ff2aafd3 -DSscrollBarTrack=ff404040 -DSscrollBarHandle=ff505050 +DSscrollBarTrack=ff3E3E3E +DSscrollBarHandle=ff4C4C4C DSsectionHeadBackground=ff1f1f1f |