mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Merge branch '4.10'
This commit is contained in:
commit
cc6a629d92
1 changed files with 4 additions and 2 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (c) 2017 Ultimaker B.V.
|
// Copyright (c) 2021 Ultimaker B.V.
|
||||||
// Uranium is released under the terms of the LGPLv3 or higher.
|
// Uranium is released under the terms of the LGPLv3 or higher.
|
||||||
|
|
||||||
import QtQuick 2.2
|
import QtQuick 2.2
|
||||||
|
|
@ -136,10 +136,12 @@ Item
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ComboBox
|
Cura.ComboBox
|
||||||
{
|
{
|
||||||
id: infillOnlyComboBox
|
id: infillOnlyComboBox
|
||||||
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
|
width: parent.width / 2 - UM.Theme.getSize("default_margin").width
|
||||||
|
height: UM.Theme.getSize("setting_control").height
|
||||||
|
textRole: "text"
|
||||||
|
|
||||||
model: ListModel
|
model: ListModel
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue