From 90426749a294382a7b6899b3e28a7e65b238d4c5 Mon Sep 17 00:00:00 2001
From: Ian Paschal <ian.paschal@gmail.com>
Date: Mon, 10 Sep 2018 11:35:58 +0200
Subject: [PATCH] Change deactiveStates to inactiveStates

Contributes to CL-1047
---
 .../UM3NetworkPrinting/resources/qml/ClusterControlItem.qml   | 4 ++--
 .../UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml    | 2 +-
 resources/themes/cura-light/theme.json                        | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml
index 9d6c31a73f..aee374c95c 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/ClusterControlItem.qml
@@ -696,13 +696,13 @@ Component
                                     color:
                                     {
                                         var state = modelData.activePrintJob.state
-                                        var deactiveStates = [
+                                        var inactiveStates = [
                                             "pausing",
                                             "paused",
                                             "resuming",
                                             "wait_cleanup"
                                         ]
-                                        if(deactiveStates.indexOf(state) > -1 && remainingTime > 0)
+                                        if(inactiveStates.indexOf(state) > -1 && remainingTime > 0)
                                         {
                                             return UM.Theme.getColor("monitor_secondary_text")
                                         }
diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml
index ee96887969..3e36ec6534 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml
@@ -10,7 +10,7 @@ Item
 {
     id: base
     property var printJob: null
-    property var shadowRadius: 5
+    property var shadowRadius: 5 * screenScaleFactor
     function getPrettyTime(time)
     {
         return OutputDevice.formatDuration(time)
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index c70aa512cf..61f60e034c 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -471,6 +471,8 @@
         "toolbox_progress_bar": [8.0, 0.5],
         "toolbox_chart_row": [1.0, 2.0],
         "toolbox_action_button": [8.0, 2.5],
-        "toolbox_loader": [2.0, 2.0]
+        "toolbox_loader": [2.0, 2.0],
+
+        "drop_shadow_radius": [1.0, 1.0]
     }
 }