3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-01 14:51:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'mb-modify-tool-panel-anchor-point' of https://github.com/smartavionics/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-15 14:53:29 +02:00
commit 1b6ef4c28c
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

38
resources/qml/Toolbar.qml
View file

@ -96,6 +96,8 @@ Item
{
UM.Controller.setActiveTool(model.id);
}
base.state = (index < toolsModel.count/2) ? "anchorAtTop" : "anchorAtBottom";
}
}
}
@ -219,4 +221,40 @@ Item
visible: toolHint.text != ""
}
states: [
State {
name: "anchorAtTop"
AnchorChanges {
target: panelBorder
anchors.top: base.top
anchors.bottom: undefined
}
PropertyChanges {
target: panelBorder
anchors.topMargin: base.activeY
}
},
State {
name: "anchorAtBottom"
AnchorChanges {
target: panelBorder
anchors.top: undefined
anchors.bottom: base.top
}
PropertyChanges {
target: panelBorder
anchors.bottomMargin: {
if (panelBorder.height > (base.activeY + UM.Theme.getSize("button").height)) {
// panel is tall, align the top of the panel with the top of the first tool button
return -panelBorder.height
}
// align the bottom of the panel with the bottom of the selected tool button
return -(base.activeY + UM.Theme.getSize("button").height)
}
}
}
]
}