From 8a182b1f3f2d6ad510ee30a8a61c56ad36035e47 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 14 Mar 2022 16:41:53 +0100 Subject: [PATCH] Workaround for windows not giving dialogs the correct width. CURA-8921 --- resources/qml/ColorDialog.qml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml index 3818ea5cb4..6877ef34b6 100644 --- a/resources/qml/ColorDialog.qml +++ b/resources/qml/ColorDialog.qml @@ -24,13 +24,9 @@ UM.Dialog // In this case we would like to let the content of the dialog determine the size of the dialog // however with the current implementation of the dialog this is not possible, so instead we calculate // the size of the dialog ourselves. - minimumWidth: content.width + 4 * margin - minimumHeight: - content.height // content height - + buttonRow.height // button row height - + 5 * margin // top and bottom margin and margin between buttons and content - width: minimumWidth - height: minimumHeight + // Ugly workaround for windows having overlapping elements due to incorrect dialog width + minimumWidth: content.width + (Qt.platform.os == "windows" ? 4 * margin : 2 * margin) + minimumHeight: content.height + buttonRow.height + (Qt.platform.os == "windows" ? 5 * margin : 3 * margin) property alias color: colorInput.text property var swatchColors: [