From 5c8c208f265c2294883917595226393bd57b7ec4 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 17 Apr 2018 11:56:09 +0200 Subject: [PATCH] QmlDesigner: Add a couple of new theme colors Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c Reviewed-by: Alessandro Portale --- .../qmldesigner/common/DesignerScrollViewStyle.qml | 2 +- share/qtcreator/themes/dark.creatortheme | 8 ++++++-- share/qtcreator/themes/default.creatortheme | 8 ++++++-- share/qtcreator/themes/flat-dark.creatortheme | 8 ++++++-- share/qtcreator/themes/flat-light.creatortheme | 8 ++++++-- share/qtcreator/themes/flat.creatortheme | 8 ++++++-- src/libs/utils/theme/theme.h | 5 ++++- .../components/resources/formeditorstylesheet.css | 6 +----- .../qmldesigner/components/resources/scrollbar.css | 2 +- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml index 2cc16975b80..b8284e7d4d2 100644 --- a/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml +++ b/share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml @@ -30,7 +30,7 @@ import QtQuickDesignerTheme 1.0 ScrollViewStyle { readonly property color scrollbarColor: Theme.color(Theme.BackgroundColorDark) - readonly property color scrollBarHandleColor: Theme.qmlDesignerButtonColor() + readonly property color scrollBarHandleColor: Theme.color(Theme.QmlDesigner_ScrollBarHandleColor) padding {left: 0; top: 0; right: 0; bottom: 0} diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index b38fbb74468..c1c8c679d85 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -16,6 +16,7 @@ warning=ffe0b716 textColorLink=ff007af4 textColorLinkVisited=ffa57aff backgroundColorDisabled=ff444444 +qmlDesignerButtonColor=ff3c3e40 [Colors] BackgroundColorAlternate=alternateBackground @@ -213,16 +214,19 @@ PaletteWindowTextDisabled=textDisabled PaletteBaseDisabled=backgroundColorDisabled PaletteTextDisabled=textDisabled -QmlDesigner_BackgroundColor=ff3c3e40 +QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff46a2da QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=ffffffff -QmlDesigner_BackgroundColorDarkAlternate=ff3c3e40 +QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor QmlDesigner_BackgroundColorDarker=ff151515 QmlDesigner_BorderColor=SplitterColor QmlDesigner_ButtonColor=ff505050 QmlDesigner_TabDark=shadowBackground QmlDesigner_TabLight=text +QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor +QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_ScrollBarHandleColor=ff505050 [Flags] ComboBoxDrawTextShadow=false diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 1807f521799..be968759de1 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -10,6 +10,7 @@ error=ffdf4f4f warning=ffecbc1c shadowBackground=ff232323 splitterColor=ff151515 +qmlDesignerButtonColor=ff4c4e50 [Colors] BackgroundColorAlternate=ff3d3d3d @@ -186,16 +187,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Warning_TextMarkColor=warning -QmlDesigner_BackgroundColor=ff4c4e50 +QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff46a2da QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=brightText -QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 +QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor QmlDesigner_BackgroundColorDarker=ff4e4e4e QmlDesigner_BorderColor=splitterColor QmlDesigner_ButtonColor=ff7a7a7a QmlDesigner_TabDark=shadowBackground QmlDesigner_TabLight=brightText +QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor +QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_ScrollBarHandleColor=ff7a7a7a [Flags] ComboBoxDrawTextShadow=true diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 0cab8b31d0d..ee6a5ba19ac 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -21,6 +21,7 @@ splitter=ff06080A textColorLink=ff007af4 textColorLinkVisited=ffa57aff backgroundColorDisabled=ff444444 +qmlDesignerButtonColor=ff4c4e50 [Colors] BackgroundColorAlternate=alternateBackground @@ -197,16 +198,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Warning_TextMarkColor=warning -QmlDesigner_BackgroundColor=ff4c4e50 +QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff3f91c4 QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=ffffffff -QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 +QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor QmlDesigner_BackgroundColorDarker=ff262728 QmlDesigner_BorderColor=splitter QmlDesigner_ButtonColor=ff595b5c QmlDesigner_TabDark=shadowBackground QmlDesigner_TabLight=text +QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor +QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_ScrollBarHandleColor=ff595b5c PaletteWindow=normalBackground PaletteWindowText=text diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index bba1c19ae18..fdc9c881d50 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -19,6 +19,7 @@ run_success=ff52c23b splitter=ffbdbebf error=ffdf4f4f warning=ffecbc1c +qmlDesignerButtonColor=fff8f8f8 [Colors] BackgroundColorAlternate=alternateBackground @@ -195,16 +196,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Warning_TextMarkColor=warning -QmlDesigner_BackgroundColor=fff8f8f8 +QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff46a2da QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=ffffffff -QmlDesigner_BackgroundColorDarkAlternate=fff8f8f8 +QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor QmlDesigner_BackgroundColorDarker=fff5f5f5 QmlDesigner_BorderColor=splitter QmlDesigner_ButtonColor=ffcccccc QmlDesigner_TabDark=ff585858 QmlDesigner_TabLight=ffd0d0d0 +QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor +QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_ScrollBarHandleColor=ffcccccc [Flags] ComboBoxDrawTextShadow=false diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 1913dac1862..9058dca642c 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -17,6 +17,7 @@ alternateBackground=ff515151 error=ffdf4f4f warning=ffecbc1c splitter=ff313131 +qmlDesignerButtonColor=ff4c4e50 [Colors] BackgroundColorAlternate=alternateBackground @@ -193,16 +194,19 @@ ProjectExplorer_TaskWarn_TextMarkColor=warning ClangCodeModel_Error_TextMarkColor=error ClangCodeModel_Warning_TextMarkColor=warning -QmlDesigner_BackgroundColor=ff4c4e50 +QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff46a2da QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=ffffffff -QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50 +QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor QmlDesigner_BackgroundColorDarker=ff262728 QmlDesigner_BorderColor=splitter QmlDesigner_ButtonColor=ff595b5c QmlDesigner_TabDark=shadowBackground QmlDesigner_TabLight=ffffffff +QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor +QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_ScrollBarHandleColor=ff595b5c [Flags] ComboBoxDrawTextShadow=false diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 6d49b49b167..6b9fea7864a 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -301,7 +301,10 @@ public: QmlDesigner_TabLight, QmlDesigner_TabDark, QmlDesigner_ButtonColor, - QmlDesigner_BorderColor + QmlDesigner_BorderColor, + QmlDesigner_FormeditorBackgroundColor, + QmlDesigner_AlternateBackgroundColor, + QmlDesigner_ScrollBarHandleColor }; enum Gradient { diff --git a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css index 5f0cb0ecc60..a46b8ed8005 100644 --- a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css +++ b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css @@ -7,11 +7,7 @@ QStackedWidget { QGraphicsView { padding: 2px; border: 0px; - background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate; -} - -QGraphicsView:focus { - background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate; + background-color: creatorTheme.QmlDesigner_FormeditorBackgroundColor; } QLineEdit diff --git a/src/plugins/qmldesigner/components/resources/scrollbar.css b/src/plugins/qmldesigner/components/resources/scrollbar.css index d019d225ea7..e9ab217685c 100644 --- a/src/plugins/qmldesigner/components/resources/scrollbar.css +++ b/src/plugins/qmldesigner/components/resources/scrollbar.css @@ -11,7 +11,7 @@ QScrollBar:horizontal { } QScrollBar::handle { - background-color: creatorTheme.QmlDesigner_ButtonColor; + background-color: creatorTheme.QmlDesigner_ScrollBarHandleColor; } QScrollBar::handle:vertical {