From 52f81b463014d8d99bae9085f3b684b6646f43a1 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Thu, 6 Aug 2020 21:25:39 +0200 Subject: [PATCH] [pc3] Make ToolBar more aligned with qqc2-desktop-style one The qqc2-desktop-style one has an implicit height of 40 plus some other tweaks --- src/declarativeimports/plasmacomponents3/ToolBar.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/declarativeimports/plasmacomponents3/ToolBar.qml b/src/declarativeimports/plasmacomponents3/ToolBar.qml index 32f4f7e6c..806ecac34 100644 --- a/src/declarativeimports/plasmacomponents3/ToolBar.qml +++ b/src/declarativeimports/plasmacomponents3/ToolBar.qml @@ -24,15 +24,17 @@ import org.kde.plasma.core 2.0 as PlasmaCore T.ToolBar { id: control - implicitWidth: contentWidth + leftPadding + rightPadding - implicitHeight: contentHeight + topPadding + bottomPadding + implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding) contentWidth: contentChildren[0].implicitWidth contentHeight: contentChildren[0].implicitHeight + padding: units.smallSpacing contentItem: Item { } background: PlasmaCore.FrameSvgItem { + implicitHeight: 40 imagePath: "widgets/toolbar" colorGroup: PlasmaCore.ColorScope.colorGroup enabledBorders: control.position == T.ToolBar.Header ? PlasmaCore.FrameSvgItem.BottomBorder : PlasmaCore.FrameSvgItem.TopBorder