Skip to content
Snippets Groups Projects
Commit f5028035 authored by SeeLook's avatar SeeLook :musical_note:
Browse files

ToolBar: fixed layout, remove padding

parent b33dbc09
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ ToolBar { ...@@ -15,6 +15,7 @@ ToolBar {
height: settAct.height height: settAct.height
z: 6 z: 6
padding: 0
Row { Row {
spacing: toolBar.width / 200 spacing: toolBar.width / 200
...@@ -73,7 +74,7 @@ ToolBar { ...@@ -73,7 +74,7 @@ ToolBar {
property var pitchView property var pitchView
target: SOUND target: SOUND
onInitialized: { function onInitialized() : void {
if (!pitchView) { if (!pitchView) {
var c = Qt.createComponent("qrc:/PitchView.qml"); var c = Qt.createComponent("qrc:/PitchView.qml");
pitchView = c.createObject(toolBar); pitchView = c.createObject(toolBar);
......
...@@ -17,6 +17,7 @@ ToolButton { ...@@ -17,6 +17,7 @@ ToolButton {
property Taction taction property Taction taction
property bool hiHover: true property bool hiHover: true
padding: 0
hoverEnabled: true hoverEnabled: true
width: Math.max(pix.width, butText.width) + (NOO.isAndroid() ? 4 : factor * 2) width: Math.max(pix.width, butText.width) + (NOO.isAndroid() ? 4 : factor * 2)
height: butText.height + pix.height + NOO.factor() / 4 height: butText.height + pix.height + NOO.factor() / 4
...@@ -40,8 +41,11 @@ ToolButton { ...@@ -40,8 +41,11 @@ ToolButton {
text: taction ? taction.text : "" text: taction ? taction.text : ""
font.pixelSize: Math.min(factor * 2.5, NOO.factor()) font.pixelSize: Math.min(factor * 2.5, NOO.factor())
anchors.horizontalCenter: parent.horizontalCenter anchors {
anchors.bottom: parent.bottom horizontalCenter: parent.horizontalCenter
bottom: parent.bottom
bottomMargin: 1
}
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
color: activPal.text color: activPal.text
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment