3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.2'

Browse source 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
This commit is contained in:
Ghostkeeper 2018-02-12 13:10:24 +01:00
commit 03b4213e92
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
17 changed files with 46 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/SidebarHeader.qml
View file

@ -257,7 +257,7 @@ Column
visible: Cura.MachineManager.hasMaterials
enabled: !extrudersList.visible || base.currentExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
width: Math.floor(parent.width * 0.7) + UM.Theme.getSize("sidebar_margin").width
anchors.right: parent.right
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true;