From f33576cc81d16c9f11856cd73aa757ae1f437419 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Tue, 18 Sep 2018 13:56:20 +0200
Subject: [PATCH 1/7] Stop simulation after pressing Up or Down in simulation
 layer textfield CURA-5725

---
 plugins/SimulationView/LayerSlider.qml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index 1540f053f5..5bce35c077 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -195,6 +195,8 @@ Item {
 
         // set the slider position based on the upper value
         function setValue(value) {
+            sliderRoot.manuallyChanged = true
+
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
 
@@ -292,6 +294,8 @@ Item {
 
         // set the slider position based on the lower value
         function setValue(value) {
+            sliderRoot.manuallyChanged = true
+
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
 
@@ -342,4 +346,4 @@ Item {
             setValue: lowerHandle.setValue // connect callback functions
         }
     }
-}
+}
\ No newline at end of file

From 1b1ca8a53bdacb7db03bcf2d2508de63b2aa6929 Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Tue, 18 Sep 2018 14:39:43 +0200
Subject: [PATCH 2/7] Fix, simulation did not play after second layer CURA-5725

---
 plugins/SimulationView/LayerSlider.qml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index 5bce35c077..ce0810b21f 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -193,10 +193,14 @@ Item {
             return result
         }
 
+        function setValueAndStopSimulation(value)
+        {
+            sliderRoot.manuallyChanged = true
+            upperHandle.setValue(value)
+        }
+
         // set the slider position based on the upper value
         function setValue(value) {
-            sliderRoot.manuallyChanged = true
-
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
 
@@ -252,7 +256,7 @@ Item {
             maximumValue: sliderRoot.maximumValue
             value: sliderRoot.upperValue
             busy: UM.SimulationView.busy
-            setValue: upperHandle.setValue // connect callback functions
+            setValue: upperHandle.setValueAndStopSimulation // connect callback functions
         }
     }
 
@@ -292,9 +296,14 @@ Item {
             return result
         }
 
+        function setValueAndStopSimulation(value)
+        {
+            sliderRoot.manuallyChanged = true
+            lowerHandle.setValue(value)
+        }
+
         // set the slider position based on the lower value
         function setValue(value) {
-            sliderRoot.manuallyChanged = true
 
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
@@ -343,7 +352,7 @@ Item {
             maximumValue: sliderRoot.maximumValue
             value: sliderRoot.lowerValue
             busy: UM.SimulationView.busy
-            setValue: lowerHandle.setValue // connect callback functions
+            setValue: lowerHandle.setValueAndStopSimulation // connect callback functions
         }
     }
 }
\ No newline at end of file

From f965b66c87efa6e37bacd2e50412a3ae984ded65 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 18 Sep 2018 16:30:15 +0200
Subject: [PATCH 3/7] Stop the simulation also when the range slider is used.
 Reuse some code.

Contributes to CURA-5725.
---
 plugins/SimulationView/LayerSlider.qml | 28 +++++++++++-----------
 plugins/SimulationView/PathSlider.qml  | 32 ++++++++++++--------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index ce0810b21f..121bd0ce7d 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -111,6 +111,12 @@ Item {
             UM.SimulationView.setMinimumLayer(lowerValue)
         }
 
+        function setValueManually(value)
+        {
+            sliderRoot.manuallyChanged = true
+            upperHandle.setValue(value)
+        }
+
         function setValue(value) {
             var range = sliderRoot.upperValue - sliderRoot.lowerValue
             value = Math.min(value, sliderRoot.maximumValue)
@@ -154,7 +160,7 @@ Item {
             maximumValue: sliderRoot.maximumValue
             value: sliderRoot.upperValue
             busy: UM.SimulationView.busy
-            setValue: rangeHandle.setValue // connect callback functions
+            setValue: rangeHandle.setValueManually // connect callback functions
         }
     }
 
@@ -193,7 +199,7 @@ Item {
             return result
         }
 
-        function setValueAndStopSimulation(value)
+        function setValueManually(value)
         {
             sliderRoot.manuallyChanged = true
             upperHandle.setValue(value)
@@ -214,16 +220,8 @@ Item {
             sliderRoot.updateRangeHandle()
         }
 
-        Keys.onUpPressed:
-        {
-            sliderRoot.manuallyChanged = true
-            upperHandleLabel.setValue(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        }
-        Keys.onDownPressed:
-        {
-            sliderRoot.manuallyChanged = true
-            upperHandleLabel.setValue(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        }
+        Keys.onUpPressed: upperHandleLabel.setValue(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onDownPressed: upperHandleLabel.setValue(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
         MouseArea {
@@ -256,7 +254,7 @@ Item {
             maximumValue: sliderRoot.maximumValue
             value: sliderRoot.upperValue
             busy: UM.SimulationView.busy
-            setValue: upperHandle.setValueAndStopSimulation // connect callback functions
+            setValue: upperHandle.setValueManually // connect callback functions
         }
     }
 
@@ -296,7 +294,7 @@ Item {
             return result
         }
 
-        function setValueAndStopSimulation(value)
+        function setValueManually(value)
         {
             sliderRoot.manuallyChanged = true
             lowerHandle.setValue(value)
@@ -352,7 +350,7 @@ Item {
             maximumValue: sliderRoot.maximumValue
             value: sliderRoot.lowerValue
             busy: UM.SimulationView.busy
-            setValue: lowerHandle.setValueAndStopSimulation // connect callback functions
+            setValue: lowerHandle.setValueManually // connect callback functions
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/SimulationView/PathSlider.qml b/plugins/SimulationView/PathSlider.qml
index 7eb56cc0b8..f89b762a60 100644
--- a/plugins/SimulationView/PathSlider.qml
+++ b/plugins/SimulationView/PathSlider.qml
@@ -36,16 +36,16 @@ Item {
     property bool pathsVisible: true
     property bool manuallyChanged: true     // Indicates whether the value was changed manually or during simulation
 
-    function getHandleValueFromSliderHandle () {
+    function getHandleValueFromSliderHandle() {
         return handle.getValue()
     }
 
-    function setHandleValue (value) {
+    function setHandleValue(value) {
         handle.setValue(value)
         updateRangeHandle()
     }
 
-    function updateRangeHandle () {
+    function updateRangeHandle() {
         rangeHandle.width = handle.x - sliderRoot.handleSize
     }
 
@@ -97,7 +97,7 @@ Item {
         color: handleLabel.activeFocus ? sliderRoot.handleActiveColor : sliderRoot.handleColor
         visible: sliderRoot.pathsVisible
 
-        function onHandleDragged () {
+        function onHandleDragged() {
             sliderRoot.manuallyChanged = true
 
             // update the range handle
@@ -108,15 +108,21 @@ Item {
         }
 
         // get the value based on the slider position
-        function getValue () {
+        function getValue() {
             var result = x / (sliderRoot.width - sliderRoot.handleSize)
             result = result * sliderRoot.maximumValue
             result = sliderRoot.roundValues ? Math.round(result) : result
             return result
         }
 
+        function setValueManually(value)
+        {
+            sliderRoot.manuallyChanged = true
+            handle.setValue(value)
+        }
+
         // set the slider position based on the value
-        function setValue (value) {
+        function setValue(value) {
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
 
@@ -130,16 +136,8 @@ Item {
             sliderRoot.updateRangeHandle()
         }
 
-        Keys.onRightPressed:
-        {
-            sliderRoot.manuallyChanged = true
-            handleLabel.setValue(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        }
-        Keys.onLeftPressed:
-        {
-            sliderRoot.manuallyChanged = true
-            handleLabel.setValue(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        }
+        Keys.onRightPressed: handleLabel.setValue(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onLeftPressed: handleLabel.setValue(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
         MouseArea {
@@ -172,7 +170,7 @@ Item {
             maximumValue: sliderRoot.maximumValue
             value: sliderRoot.handleValue
             busy: UM.SimulationView.busy
-            setValue: handle.setValue // connect callback functions
+            setValue: handle.setValueManually // connect callback functions
         }
     }
 }

From 0ef46feeaeffb38bea03d2c7b26682406f4c5d17 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 18 Sep 2018 16:53:25 +0200
Subject: [PATCH 4/7] Fix code style.

Contributes to CURA-5725.
---
 plugins/SimulationView/LayerSlider.qml | 110 ++++++++++++++++---------
 plugins/SimulationView/PathSlider.qml  |  54 +++++++-----
 2 files changed, 105 insertions(+), 59 deletions(-)

diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index 121bd0ce7d..0a9f533cdd 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -9,7 +9,8 @@ import QtQuick.Controls.Styles 1.1
 import UM 1.0 as UM
 import Cura 1.0 as Cura
 
-Item {
+Item
+{
     id: sliderRoot
 
     // handle properties
@@ -41,39 +42,47 @@ Item {
     property bool layersVisible: true
     property bool manuallyChanged: true     // Indicates whether the value was changed manually or during simulation
 
-    function getUpperValueFromSliderHandle() {
+    function getUpperValueFromSliderHandle()
+    {
         return upperHandle.getValue()
     }
 
-    function setUpperValue(value) {
+    function setUpperValue(value)
+    {
         upperHandle.setValue(value)
         updateRangeHandle()
     }
 
-    function getLowerValueFromSliderHandle() {
+    function getLowerValueFromSliderHandle()
+    {
         return lowerHandle.getValue()
     }
 
-    function setLowerValue(value) {
+    function setLowerValue(value)
+    {
         lowerHandle.setValue(value)
         updateRangeHandle()
     }
 
-    function updateRangeHandle() {
+    function updateRangeHandle()
+    {
         rangeHandle.height = lowerHandle.y - (upperHandle.y + upperHandle.height)
     }
 
     // set the active handle to show only one label at a time
-    function setActiveHandle(handle) {
+    function setActiveHandle(handle)
+    {
         activeHandle = handle
     }
 
-    function normalizeValue(value) {
+    function normalizeValue(value)
+    {
         return Math.min(Math.max(value, sliderRoot.minimumValue), sliderRoot.maximumValue)
     }
 
     // slider track
-    Rectangle {
+    Rectangle
+    {
         id: track
 
         width: sliderRoot.trackThickness
@@ -87,7 +96,8 @@ Item {
     }
 
     // Range handle
-    Item {
+    Item
+    {
         id: rangeHandle
 
         y: upperHandle.y + upperHandle.height
@@ -97,7 +107,8 @@ Item {
         visible: sliderRoot.layersVisible
 
         // set the new value when dragging
-        function onHandleDragged() {
+        function onHandleDragged()
+        {
             sliderRoot.manuallyChanged = true
 
             upperHandle.y = y - upperHandle.height
@@ -117,7 +128,8 @@ Item {
             upperHandle.setValue(value)
         }
 
-        function setValue(value) {
+        function setValue(value)
+        {
             var range = sliderRoot.upperValue - sliderRoot.lowerValue
             value = Math.min(value, sliderRoot.maximumValue)
             value = Math.max(value, sliderRoot.minimumValue + range)
@@ -126,17 +138,20 @@ Item {
             UM.SimulationView.setMinimumLayer(value - range)
         }
 
-        Rectangle {
+        Rectangle
+        {
             width: sliderRoot.trackThickness - 2 * sliderRoot.trackBorderWidth
             height: parent.height + sliderRoot.handleSize
             anchors.centerIn: parent
             color: sliderRoot.rangeHandleColor
         }
 
-        MouseArea {
+        MouseArea
+        {
             anchors.fill: parent
 
-            drag {
+            drag
+            {
                 target: parent
                 axis: Drag.YAxis
                 minimumY: upperHandle.height
@@ -147,7 +162,8 @@ Item {
             onPressed: sliderRoot.setActiveHandle(rangeHandle)
         }
 
-        SimulationSliderLabel {
+        SimulationSliderLabel
+        {
             id: rangleHandleLabel
 
             height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
@@ -165,7 +181,8 @@ Item {
     }
 
     // Upper handle
-    Rectangle {
+    Rectangle
+    {
         id: upperHandle
 
         y: sliderRoot.height - (sliderRoot.minimumRangeHandleSize + 2 * sliderRoot.handleSize)
@@ -176,11 +193,13 @@ Item {
         color: upperHandleLabel.activeFocus ? sliderRoot.handleActiveColor : sliderRoot.upperHandleColor
         visible: sliderRoot.layersVisible
 
-        function onHandleDragged() {
+        function onHandleDragged()
+        {
             sliderRoot.manuallyChanged = true
 
             // don't allow the lower handle to be heigher than the upper handle
-            if (lowerHandle.y - (y + height) < sliderRoot.minimumRangeHandleSize) {
+            if (lowerHandle.y - (y + height) < sliderRoot.minimumRangeHandleSize)
+            {
                 lowerHandle.y = y + height + sliderRoot.minimumRangeHandleSize
             }
 
@@ -192,7 +211,8 @@ Item {
         }
 
         // get the upper value based on the slider position
-        function getValue() {
+        function getValue()
+        {
             var result = y / (sliderRoot.height - (2 * sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize))
             result = sliderRoot.maximumValue + result * (sliderRoot.minimumValue - (sliderRoot.maximumValue - sliderRoot.minimumValue))
             result = sliderRoot.roundValues ? Math.round(result) : result
@@ -206,7 +226,8 @@ Item {
         }
 
         // set the slider position based on the upper value
-        function setValue(value) {
+        function setValue(value)
+        {
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
 
@@ -220,14 +241,16 @@ Item {
             sliderRoot.updateRangeHandle()
         }
 
-        Keys.onUpPressed: upperHandleLabel.setValue(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        Keys.onDownPressed: upperHandleLabel.setValue(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onUpPressed: upperHandleLabel.setValueManually(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onDownPressed: upperHandleLabel.setValueManually(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
-        MouseArea {
+        MouseArea
+        {
             anchors.fill: parent
 
-            drag {
+            drag
+            {
                 target: parent
                 axis: Drag.YAxis
                 minimumY: 0
@@ -235,13 +258,15 @@ Item {
             }
 
             onPositionChanged: parent.onHandleDragged()
-            onPressed: {
+            onPressed:
+            {
                 sliderRoot.setActiveHandle(upperHandle)
                 upperHandleLabel.forceActiveFocus()
             }
         }
 
-        SimulationSliderLabel {
+        SimulationSliderLabel
+        {
             id: upperHandleLabel
 
             height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
@@ -259,7 +284,8 @@ Item {
     }
 
     // Lower handle
-    Rectangle {
+    Rectangle
+    {
         id: lowerHandle
 
         y: sliderRoot.height - sliderRoot.handleSize
@@ -271,11 +297,13 @@ Item {
 
         visible: sliderRoot.layersVisible
 
-        function onHandleDragged() {
+        function onHandleDragged()
+        {
             sliderRoot.manuallyChanged = true
 
             // don't allow the upper handle to be lower than the lower handle
-            if (y - (upperHandle.y + upperHandle.height) < sliderRoot.minimumRangeHandleSize) {
+            if (y - (upperHandle.y + upperHandle.height) < sliderRoot.minimumRangeHandleSize)
+            {
                 upperHandle.y = y - (upperHandle.heigth + sliderRoot.minimumRangeHandleSize)
             }
 
@@ -287,21 +315,23 @@ Item {
         }
 
         // get the lower value from the current slider position
-        function getValue() {
+        function getValue()
+        {
             var result = (y - (sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize)) / (sliderRoot.height - (2 * sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize));
             result = sliderRoot.maximumValue - sliderRoot.minimumRange + result * (sliderRoot.minimumValue - (sliderRoot.maximumValue - sliderRoot.minimumRange))
             result = sliderRoot.roundValues ? Math.round(result) : result
             return result
         }
 
-        function setValueManually(value)
+        function setValueManually(handle, value)
         {
             sliderRoot.manuallyChanged = true
-            lowerHandle.setValue(value)
+            handle.setValue(value)
         }
 
         // set the slider position based on the lower value
-        function setValue(value) {
+        function setValue(value)
+        {
 
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
@@ -320,10 +350,12 @@ Item {
         Keys.onDownPressed: lowerHandleLabel.setValue(lowerHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
-        MouseArea {
+        MouseArea
+        {
             anchors.fill: parent
 
-            drag {
+            drag
+            {
                 target: parent
                 axis: Drag.YAxis
                 minimumY: upperHandle.height + sliderRoot.minimumRangeHandleSize
@@ -331,13 +363,15 @@ Item {
             }
 
             onPositionChanged: parent.onHandleDragged()
-            onPressed: {
+            onPressed:
+            {
                 sliderRoot.setActiveHandle(lowerHandle)
                 lowerHandleLabel.forceActiveFocus()
             }
         }
 
-        SimulationSliderLabel {
+        SimulationSliderLabel
+        {
             id: lowerHandleLabel
 
             height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height
diff --git a/plugins/SimulationView/PathSlider.qml b/plugins/SimulationView/PathSlider.qml
index f89b762a60..516cf988dc 100644
--- a/plugins/SimulationView/PathSlider.qml
+++ b/plugins/SimulationView/PathSlider.qml
@@ -9,7 +9,8 @@ import QtQuick.Controls.Styles 1.1
 import UM 1.0 as UM
 import Cura 1.0 as Cura
 
-Item {
+Item
+{
     id: sliderRoot
 
     // handle properties
@@ -36,25 +37,30 @@ Item {
     property bool pathsVisible: true
     property bool manuallyChanged: true     // Indicates whether the value was changed manually or during simulation
 
-    function getHandleValueFromSliderHandle() {
+    function getHandleValueFromSliderHandle()
+    {
         return handle.getValue()
     }
 
-    function setHandleValue(value) {
+    function setHandleValue(value
+     {
         handle.setValue(value)
         updateRangeHandle()
     }
 
-    function updateRangeHandle() {
+    function updateRangeHandle()
+    {
         rangeHandle.width = handle.x - sliderRoot.handleSize
     }
 
-    function normalizeValue(value) {
+    function normalizeValue(value)
+    {
         return Math.min(Math.max(value, sliderRoot.minimumValue), sliderRoot.maximumValue)
     }
 
     // slider track
-    Rectangle {
+    Rectangle
+    {
         id: track
 
         width: sliderRoot.width - sliderRoot.handleSize
@@ -68,7 +74,8 @@ Item {
     }
 
     // Progress indicator
-    Item {
+    Item
+    {
         id: rangeHandle
 
         x: handle.width
@@ -77,7 +84,8 @@ Item {
         anchors.verticalCenter: sliderRoot.verticalCenter
         visible: sliderRoot.pathsVisible
 
-        Rectangle {
+        Rectangle
+        {
             height: sliderRoot.trackThickness - 2 * sliderRoot.trackBorderWidth
             width: parent.width + sliderRoot.handleSize
             anchors.centerIn: parent
@@ -86,7 +94,8 @@ Item {
     }
 
     // Handle
-    Rectangle {
+    Rectangle
+    {
         id: handle
 
         x: sliderRoot.handleSize
@@ -97,7 +106,8 @@ Item {
         color: handleLabel.activeFocus ? sliderRoot.handleActiveColor : sliderRoot.handleColor
         visible: sliderRoot.pathsVisible
 
-        function onHandleDragged() {
+        function onHandleDragged()
+        {
             sliderRoot.manuallyChanged = true
 
             // update the range handle
@@ -108,7 +118,8 @@ Item {
         }
 
         // get the value based on the slider position
-        function getValue() {
+        function getValue()
+        {
             var result = x / (sliderRoot.width - sliderRoot.handleSize)
             result = result * sliderRoot.maximumValue
             result = sliderRoot.roundValues ? Math.round(result) : result
@@ -122,7 +133,8 @@ Item {
         }
 
         // set the slider position based on the value
-        function setValue(value) {
+        function setValue(value)
+        {
             // Normalize values between range, since using arrow keys will create out-of-the-range values
             value = sliderRoot.normalizeValue(value)
 
@@ -136,27 +148,27 @@ Item {
             sliderRoot.updateRangeHandle()
         }
 
-        Keys.onRightPressed: handleLabel.setValue(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        Keys.onLeftPressed: handleLabel.setValue(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onRightPressed: handleLabel.setValueManually(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onLeftPressed: handleLabel.setValueManually(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
-        MouseArea {
+        MouseArea
+        {
             anchors.fill: parent
 
-            drag {
+            drag
+            {
                 target: parent
                 axis: Drag.XAxis
                 minimumX: 0
                 maximumX: sliderRoot.width - sliderRoot.handleSize
             }
-            onPressed: {
-                handleLabel.forceActiveFocus()
-            }
-
+            onPressed: handleLabel.forceActiveFocus()
             onPositionChanged: parent.onHandleDragged()
         }
 
-        SimulationSliderLabel {
+        SimulationSliderLabel
+        {
             id: handleLabel
 
             height: sliderRoot.handleSize + UM.Theme.getSize("default_margin").height

From c31f584e5b8a871ebe4e650dd356828a3d0bfc50 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 18 Sep 2018 17:04:24 +0200
Subject: [PATCH 5/7] Fix my own mistake. The keys act throught the labels and
 the function in the labels is called setValue that then points to the
 setValueManually.

Contributes to CURA-5725.
---
 plugins/SimulationView/LayerSlider.qml | 4 ++--
 plugins/SimulationView/PathSlider.qml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index 0a9f533cdd..342ec829b9 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -241,8 +241,8 @@ Item
             sliderRoot.updateRangeHandle()
         }
 
-        Keys.onUpPressed: upperHandleLabel.setValueManually(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        Keys.onDownPressed: upperHandleLabel.setValueManually(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onUpPressed: upperHandleLabel.setValue(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onDownPressed: upperHandleLabel.setValue(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
         MouseArea
diff --git a/plugins/SimulationView/PathSlider.qml b/plugins/SimulationView/PathSlider.qml
index 516cf988dc..f532294682 100644
--- a/plugins/SimulationView/PathSlider.qml
+++ b/plugins/SimulationView/PathSlider.qml
@@ -148,8 +148,8 @@ Item
             sliderRoot.updateRangeHandle()
         }
 
-        Keys.onRightPressed: handleLabel.setValueManually(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
-        Keys.onLeftPressed: handleLabel.setValueManually(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onRightPressed: handleLabel.setValue(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
+        Keys.onLeftPressed: handleLabel.setValue(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
 
         // dragging
         MouseArea

From 13cab3653e499640d371a083856f8d1bfe9e83f0 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 18 Sep 2018 17:09:57 +0200
Subject: [PATCH 6/7] Remove unworking code that I forgot to remove after
 explaining a possible solution to myself.

Contributes to CURA-5725
---
 plugins/SimulationView/LayerSlider.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml
index 342ec829b9..841472a836 100644
--- a/plugins/SimulationView/LayerSlider.qml
+++ b/plugins/SimulationView/LayerSlider.qml
@@ -323,10 +323,10 @@ Item
             return result
         }
 
-        function setValueManually(handle, value)
+        function setValueManually(value)
         {
             sliderRoot.manuallyChanged = true
-            handle.setValue(value)
+            lowerHandle.setValue(value)
         }
 
         // set the slider position based on the lower value

From ed9b0dd41bace92528cdda26b1c60fc0fc383ad3 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 18 Sep 2018 17:25:35 +0200
Subject: [PATCH 7/7] Add a missing bracket back.

Contributes to CURA-5725.
---
 plugins/SimulationView/PathSlider.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/SimulationView/PathSlider.qml b/plugins/SimulationView/PathSlider.qml
index f532294682..f3c28fb5f7 100644
--- a/plugins/SimulationView/PathSlider.qml
+++ b/plugins/SimulationView/PathSlider.qml
@@ -42,8 +42,8 @@ Item
         return handle.getValue()
     }
 
-    function setHandleValue(value
-     {
+    function setHandleValue(value)
+    {
         handle.setValue(value)
         updateRangeHandle()
     }