From c7929fa0530d34f34902c4f31889b03663970e69 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 15 Jun 2020 12:22:20 +0200 Subject: [PATCH 1/2] Fix theming of width/height of this dialogue Also allow resizing it, because why not. Contributes to #7926. --- resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index b7fe022d78..a24f3f5673 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -14,8 +14,8 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Discard or Keep changes") - width: UM.Theme.getSize("popup_dialog").width - height: UM.Theme.getSize("popup_dialog").height + minimumWidth: UM.Theme.getSize("popup_dialog").width + minimumHeight: UM.Theme.getSize("popup_dialog").height property var changesModel: Cura.UserChangesModel{ id: userChangesModel} onVisibilityChanged: { From 09298eac935447cf5935dddb8e5d752f98b0a364 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 15 Jun 2020 12:24:39 +0200 Subject: [PATCH 2/2] Elide setting name if it's too long This keeps the text readable. Fixes #7926. --- resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index a24f3f5673..a5ee7b5986 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -80,6 +80,8 @@ UM.Dialog property var extruder_name: userChangesModel.getItem(styleData.row).extruder anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.right: parent.right + elide: Text.ElideRight font: UM.Theme.getFont("system") text: {