From b35d02f0d9f79b5413cd307a951853c97077960b Mon Sep 17 00:00:00 2001 From: Brook Cronin Date: Thu, 9 Feb 2023 22:16:52 +0100 Subject: [PATCH] QmlDesigner: Minor style adjustments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ieafb8c16aed985847ed1dd66a8ace05c955601d6 Reviewed-by: Thomas Hartmann Reviewed-by: Reviewed-by: Henning Gründl --- .../imports/StudioTheme/PrimaryButtonStyle.qml | 1 + .../imports/StudioTheme/ToolbarStyle.qml | 1 + .../imports/StudioTheme/TopToolbarButtonStyle.qml | 3 ++- .../propertyEditorQmlSources/imports/StudioTheme/Values.qml | 2 +- share/qtcreator/qmldesigner/toolbar/Main.qml | 2 +- share/qtcreator/themes/design.creatortheme | 5 +++-- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/PrimaryButtonStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/PrimaryButtonStyle.qml index 030436df091..c1cf5be9cf8 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/PrimaryButtonStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/PrimaryButtonStyle.qml @@ -4,6 +4,7 @@ import QtQuick ControlStyle { + controlSize: Qt.size(Values.topLevelComboWidth, Values.topLevelComboHeight) baseIconFontSize: Values.baseFontSize radius: Values.smallRadius diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ToolbarStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ToolbarStyle.qml index 293b8d33893..af7b641cfef 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ToolbarStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ToolbarStyle.qml @@ -11,5 +11,6 @@ ControlStyle { background.hover: Values.themeControlBackground_topToolbarHover background.globalHover: Values.themeControlBackground_topToolbarHover border.idle: Values.controlOutline_toolbarIdle + border.hover: Values.themeControlBackground_topToolbarHover text.hover: Values.themeTextColor } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml index 22590f363fb..21efb3b730a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/TopToolbarButtonStyle.qml @@ -6,6 +6,7 @@ import QtQuick ControlStyle { controlSize: Qt.size(Values.topLevelComboWidth, Values.topLevelComboHeight) + borderWidth: Values.border baseIconFontSize: Values.topLevelComboIcon radius: Values.smallRadius @@ -26,7 +27,7 @@ ControlStyle { border: ControlStyle.BorderColors { idle: Values.themeControlBackground_toolbarIdle - hover: Values.themeControlBackground_toolbarHover + hover: Values.themeControlBackground_topToolbarHover interaction: Values.themeInteraction disabled: Values.themeControlBackground_toolbarIdle } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 197d3c42fa7..8c57f7a9704 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -161,7 +161,7 @@ QtObject { + values.twoControlColumnGap + values.actionIndicatorWidth - property real twoControlColumnWidthMin: 3 * values.height - 2 * values.border + property real twoControlColumnWidthMin: 3 * values.height - 2 * values.border - 10 property real twoControlColumnWidthMax: 3 * values.twoControlColumnWidthMin property real twoControlColumnWidth: values.twoControlColumnWidthMin diff --git a/share/qtcreator/qmldesigner/toolbar/Main.qml b/share/qtcreator/qmldesigner/toolbar/Main.qml index 0f0dda321df..fa562c526ce 100644 --- a/share/qtcreator/qmldesigner/toolbar/Main.qml +++ b/share/qtcreator/qmldesigner/toolbar/Main.qml @@ -89,7 +89,7 @@ Rectangle { border: StudioTheme.ControlStyle.BorderColors { idle: StudioTheme.Values.themeControlBackground_toolbarIdle - hover: StudioTheme.Values.themeControlBackground_toolbarHover + hover: StudioTheme.Values.themeControlBackground_topToolbarHover interaction: StudioTheme.Values.themeInteraction disabled: StudioTheme.Values.themeControlBackground_toolbarIdle } diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index a7985269e05..20d24fcb8e1 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -101,6 +101,8 @@ DStabFocusButtonPress=highlightBlue DStabFocusBackground=highlightBlue DSnavigatorText=lightWhite DSpopupBackground=offBlack +DSinteractionHover=highlightHover +DSnavigatorTextSelected=highlightBlue ;contentious remap ;background color for main form view, library, navigator, properties, connections @@ -126,7 +128,6 @@ DSerrorColor=ffdf3a3a DSwarningColor=warning DSdisabledColor=ff707070 -DSinteractionHover=ff74cbfc DScontrolBackgroundInteraction=ff3d3d3d DScontrolBackgroundDisabled=ff2e2f30 @@ -213,7 +214,7 @@ DStabFocusIcon=ff000000 DSnavigatorBranch=ff7c7b7b DSnavigatorBranchIndicator=ff7c7b7b DSnavigatorTextHover=ffffffff -DSnavigatorTextSelected=ff2aafd3 + DSnavigatorIcon=ffffffff DSnavigatorIconHover=ffa1a1a1 DSnavigatorIconSelected=ffffffff