Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey de l'Arago <joeydelarago@gmail.com>2022-10-21 12:16:26 +0300
committerGitHub <noreply@github.com>2022-10-21 12:16:26 +0300
commita9f4b2da71f983a947dafcd16e2efdb8983820b1 (patch)
treedb40d6d833d0698c537c064f2d63ebf8b33cb0c8
parent09c86e6b98688081393339de0ec29055618fe2a4 (diff)
parenteee3a067433053569c9215278d3292c2369b68a3 (diff)
Merge pull request #12254 from Ultimaker/fix_materials_list_too_small
Allow text to be wider if favourite button is not shown
-rw-r--r--resources/qml/Preferences/Materials/MaterialsSlot.qml6
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml
index 8292fbe6da..287b4080fc 100644
--- a/resources/qml/Preferences/Materials/MaterialsSlot.qml
+++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml
@@ -47,7 +47,7 @@ Rectangle
radius: width / 2
anchors.verticalCenter: materialSlot.verticalCenter
anchors.left: materialSlot.left
- anchors.leftMargin: 2 * UM.Theme.getSize("default_margin").width
+ anchors.leftMargin: UM.Theme.getSize("default_margin").width
}
UM.Label
{
@@ -58,7 +58,7 @@ Rectangle
wrapMode: Text.NoWrap
verticalAlignment: Text.AlignVCenter
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.rightMargin: UM.Theme.getSize("narrow_margin").width
anchors.verticalCenter: materialSlot.verticalCenter
@@ -102,7 +102,7 @@ Rectangle
]
implicitHeight: parent.height
- implicitWidth: height
+ implicitWidth: favoriteIndicator.width
anchors.right: materialSlot.right
visible: false