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

Merge branch 'master' into marketplace_redesign

Browse source 
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
This commit is contained in:
Ghostkeeper 2022-01-20 15:57:28 +01:00
commit efcd00e2f3
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
68 changed files with 1974 additions and 3039 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/ActionButton.qml
View file

@ -149,8 +149,8 @@ Button
// Using parent.width is fine in fixedWidthMode.
target: buttonText
property: "width"
value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding
: ((maximumWidth != 0 && button.contentWidth > maximumWidth) ? maximumWidth : undefined)
value: button.fixedWidthMode ? (button.width - button.leftPadding - button.rightPadding)
: ((button.maximumWidth != 0 && button.implicitContentWidth > button.maximumWidth) ? (button.maximumWidth - (button.width - button.implicitContentWidth) * 2) : undefined)
}
}