From ab4da4ab360523a220fb3079752e3d26b47864ed Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Sat, 2 Sep 2017 08:40:01 +0100 Subject: [PATCH 1/3] Now layer start X/Y can be < 0 when machine centre is zero. --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4beec290ca..da08f4b472 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2997,7 +2997,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "minimum_value": "0", + "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, "settable_per_meshgroup": true @@ -3009,7 +3009,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "minimum_value": "0", + "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, "settable_per_meshgroup": true From f803e72c188af901eb57f917f723522e9b7ea5b3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 4 Sep 2017 17:25:23 +0200 Subject: [PATCH 2/3] Use Screen.devicePixelRatio for plugin browser CURA-4279 --- plugins/PluginBrowser/PluginBrowser.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/PluginBrowser/PluginBrowser.qml b/plugins/PluginBrowser/PluginBrowser.qml index 494e09e26b..f8a4001443 100644 --- a/plugins/PluginBrowser/PluginBrowser.qml +++ b/plugins/PluginBrowser/PluginBrowser.qml @@ -9,10 +9,10 @@ UM.Dialog id: base title: catalog.i18nc("@title:window", "Find & Update plugins") - width: 600 - height: 450 - minimumWidth: 350 - minimumHeight: 350 + width: 600 * Screen.devicePixelRatio + height: 450 * Screen.devicePixelRatio + minimumWidth: 350 * Screen.devicePixelRatio + minimumHeight: 350 * Screen.devicePixelRatio Item { anchors.fill: parent From 4249274af0f46ed473dd5e78654a6d27ce5d2ab4 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 4 Sep 2017 17:25:56 +0200 Subject: [PATCH 3/3] Move license window size to light theme CURA-4279 The light theme is now the default and it's a base theme, so the window size needs to be there. --- resources/themes/cura-light/theme.json | 1 + resources/themes/cura/theme.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index eb9fb72db6..00f8bcd2b8 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -332,6 +332,7 @@ "save_button_specs_icons": [1.4, 1.4], "modal_window_minimum": [60.0, 45], + "license_window_minimum": [45, 45], "wizard_progress": [10.0, 0.0], "message": [30.0, 5.0], diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 3ef5366c9e..3f9d98b5b4 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -278,7 +278,6 @@ "save_button_specs_icons": [1.4, 1.4], "modal_window_minimum": [60.0, 45], - "license_window_minimum": [45, 45], "wizard_progress": [10.0, 0.0], "message": [30.0, 5.0],