From f50280355dbc49e449a3dc1c7186e4cac8219706 Mon Sep 17 00:00:00 2001 From: SeeLook <seelook@gmail.com> Date: Sat, 8 Feb 2025 10:31:30 +0100 Subject: [PATCH] ToolBar: fixed layout, remove padding --- src/qml/TtoolBar.qml | 3 ++- src/qml/shared/HeadButton.qml | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qml/TtoolBar.qml b/src/qml/TtoolBar.qml index 96416af3..7c63d84f 100644 --- a/src/qml/TtoolBar.qml +++ b/src/qml/TtoolBar.qml @@ -15,6 +15,7 @@ ToolBar { height: settAct.height z: 6 + padding: 0 Row { spacing: toolBar.width / 200 @@ -73,7 +74,7 @@ ToolBar { property var pitchView target: SOUND - onInitialized: { + function onInitialized() : void { if (!pitchView) { var c = Qt.createComponent("qrc:/PitchView.qml"); pitchView = c.createObject(toolBar); diff --git a/src/qml/shared/HeadButton.qml b/src/qml/shared/HeadButton.qml index d67b87ab..d2b3f954 100644 --- a/src/qml/shared/HeadButton.qml +++ b/src/qml/shared/HeadButton.qml @@ -17,6 +17,7 @@ ToolButton { property Taction taction property bool hiHover: true + padding: 0 hoverEnabled: true width: Math.max(pix.width, butText.width) + (NOO.isAndroid() ? 4 : factor * 2) height: butText.height + pix.height + NOO.factor() / 4 @@ -40,8 +41,11 @@ ToolButton { text: taction ? taction.text : "" font.pixelSize: Math.min(factor * 2.5, NOO.factor()) - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom + anchors { + horizontalCenter: parent.horizontalCenter + bottom: parent.bottom + bottomMargin: 1 + } horizontalAlignment: Text.AlignHCenter color: activPal.text } -- GitLab