3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into network_rewrite

Browse source
This commit is contained in:
ChrisTerBeke 2018-01-03 14:17:48 +01:00 • committed by GitHub
commit 182e7de07d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 11010 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Topbar.qml
View file

@ -25,9 +25,12 @@ Rectangle
property int allItemsWidth: 0;
function updateMarginsAndSizes() {
if (UM.Preferences.getValue("cura/sidebar_collapse")) {
if (UM.Preferences.getValue("cura/sidebar_collapsed"))
{
rightMargin = UM.Theme.getSize("default_margin").width;
} else {
}
else
{
rightMargin = UM.Theme.getSize("sidebar").width + UM.Theme.getSize("default_margin").width;
}
allItemsWidth = (