From cbf553aad16483319dcb8a8163bb68b83b0854cb Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 23 Dec 2016 12:55:16 +0100 Subject: [PATCH] Fix scale of Add Machine and Select (Per Object) Settings dialogs... ... on fairly high, but non-"retina" screens. I have a new laptop with a 13" 1080p display, which I use at its native resolution. This works fine for most dialogs, except the mentioned two which are shown comically large. --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 2 +- resources/qml/AddMachineDialog.qml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index c7eed579e2..9811316948 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -322,7 +322,7 @@ Item { id: settingPickDialog title: catalog.i18nc("@title:window", "Select Settings to Customize for this model") - width: screenScaleFactor * 360; + width: Screen.devicePixelRatio * 360; property string labelFilter: "" diff --git a/resources/qml/AddMachineDialog.qml b/resources/qml/AddMachineDialog.qml index 8506074b0d..8a97a23bb3 100644 --- a/resources/qml/AddMachineDialog.qml +++ b/resources/qml/AddMachineDialog.qml @@ -20,6 +20,11 @@ UM.Dialog property string preferredCategory: "Ultimaker" property string activeCategory: preferredCategory + minimumWidth: UM.Theme.getSize("modal_window_minimum").width + minimumHeight: UM.Theme.getSize("modal_window_minimum").height + width: minimumWidth + height: minimumHeight + onVisibilityChanged: { // Reset selection and machine name