From b8aef40210eee24dc63decf9a31923bb3e6304b4 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Fri, 13 Dec 2019 15:37:00 +0300 Subject: [PATCH] Fix ToolStrip height --- src/QmlControls/ToolStrip.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml index 740050fea..79e870e33 100644 --- a/src/QmlControls/ToolStrip.qml +++ b/src/QmlControls/ToolStrip.qml @@ -19,7 +19,7 @@ Rectangle { id: _root color: qgcPal.globalTheme === QGCPalette.Light ? QGroundControl.corePlugin.options.toolbarBackgroundLight : QGroundControl.corePlugin.options.toolbarBackgroundDark width: _idealWidth < repeater.contentWidth ? repeater.contentWidth : _idealWidth - height: Math.min(maxHeight, toolStripColumn.height + (toolStripColumn.anchors.margins * 2)) + height: Math.min(maxHeight, toolStripColumn.height + (flickable.anchors.margins * 2)) radius: ScreenTools.defaultFontPixelWidth / 2 property alias model: repeater.model @@ -56,6 +56,7 @@ Rectangle { } QGCFlickable { + id: flickable anchors.margins: ScreenTools.defaultFontPixelWidth * 0.4 anchors.top: parent.top anchors.left: parent.left -- 2.22.0