3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed merge issues

Browse source
This commit is contained in:
Jaime van Kessel 2015-08-27 16:09:42 +02:00
commit 74a1a5f6f1
19 changed files with 325 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Sidebar.qml
View file

@ -102,7 +102,7 @@ Rectangle
{
id: saveButton;
implicitWidth: base.width
implicitHeight: UM.Theme.sizes.save_button_text_margin.height * 2 + UM.Theme.sizes.save_button_slicing_bar.height + UM.Theme.sizes.save_button_save_to_button.height + UM.Theme.sizes.default_margin.height
implicitHeight: totalHeight
}
}