mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-05-22 04:29:01 +08:00
Merge pull request #12254 from Ultimaker/fix_materials_list_too_small
Allow text to be wider if favourite button is not shown
This commit is contained in:
commit
a9f4b2da71
@ -47,7 +47,7 @@ Rectangle
|
|||||||
radius: width / 2
|
radius: width / 2
|
||||||
anchors.verticalCenter: materialSlot.verticalCenter
|
anchors.verticalCenter: materialSlot.verticalCenter
|
||||||
anchors.left: materialSlot.left
|
anchors.left: materialSlot.left
|
||||||
anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||||
}
|
}
|
||||||
UM.Label
|
UM.Label
|
||||||
{
|
{
|
||||||
@ -58,7 +58,7 @@ Rectangle
|
|||||||
wrapMode: Text.NoWrap
|
wrapMode: Text.NoWrap
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
anchors.left: swatch.right
|
anchors.left: swatch.right
|
||||||
anchors.right: favoriteButton.left
|
anchors.right: favoriteButton.visible ? favoriteButton.left : parent.right
|
||||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||||
anchors.rightMargin: UM.Theme.getSize("narrow_margin").width
|
anchors.rightMargin: UM.Theme.getSize("narrow_margin").width
|
||||||
anchors.verticalCenter: materialSlot.verticalCenter
|
anchors.verticalCenter: materialSlot.verticalCenter
|
||||||
@ -102,7 +102,7 @@ Rectangle
|
|||||||
]
|
]
|
||||||
|
|
||||||
implicitHeight: parent.height
|
implicitHeight: parent.height
|
||||||
implicitWidth: height
|
implicitWidth: favoriteIndicator.width
|
||||||
anchors.right: materialSlot.right
|
anchors.right: materialSlot.right
|
||||||
visible: false
|
visible: false
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user