mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-07 14:04:03 -06:00
Merge branch '3.2'
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
This commit is contained in:
commit
03b4213e92
17 changed files with 46 additions and 43 deletions
|
@ -187,8 +187,8 @@ Button
|
|||
id: settingsButton
|
||||
|
||||
visible: base.hovered || settingsButton.hovered
|
||||
height: base.height * 0.6
|
||||
width: base.height * 0.6
|
||||
height: Math.floor(base.height * 0.6)
|
||||
width: Math.floor(base.height * 0.6)
|
||||
|
||||
anchors {
|
||||
right: inheritButton.visible ? inheritButton.left : parent.right
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue