From 342d4f1b82754e3b6834e2c0ae3cb3a3e5f456f3 Mon Sep 17 00:00:00 2001
From: Jack Ha <j.ha@ultimaker.com>
Date: Thu, 7 Jul 2016 16:23:27 +0200
Subject: [PATCH 1/2] Changed tooltip extremely small.

CURA-1671
---
 plugins/LayerView/LayerView.py            | 2 --
 resources/qml/Preferences/GeneralPage.qml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/LayerView/LayerView.py b/plugins/LayerView/LayerView.py
index cd7a17a357..9725f2292d 100644
--- a/plugins/LayerView/LayerView.py
+++ b/plugins/LayerView/LayerView.py
@@ -135,8 +135,6 @@ class LayerView(View):
 
             self.currentLayerNumChanged.emit()
 
-    currentLayerNumChanged = Signal()
-
     def calculateMaxLayers(self):
         scene = self.getController().getScene()
         renderer = self.getRenderer() # TODO: @UnusedVariable
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 2886f94d92..7e5b4efadc 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -246,7 +246,7 @@ UM.PreferencesPage
         UM.TooltipArea {
             width: childrenRect.width
             height: childrenRect.height
-            text: catalog.i18nc("@info:tooltip","Should objects be scaled up if they are extremely small?")
+            text: catalog.i18nc("@info:tooltip","An object may appear extremely small if its unit is for example in meters rather than millimeters. Should these objects be scaled up?")
 
             CheckBox
             {

From 6374eee7b45e4065b1a95c26674b8f27dd954eeb Mon Sep 17 00:00:00 2001
From: Jack Ha <j.ha@ultimaker.com>
Date: Thu, 7 Jul 2016 16:55:56 +0200
Subject: [PATCH 2/2] Fix LayerView cursor issue.

CURA-1381
---
 plugins/LayerView/LayerView.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml
index 4779d74720..a7e9a7c67d 100644
--- a/plugins/LayerView/LayerView.qml
+++ b/plugins/LayerView/LayerView.qml
@@ -69,7 +69,7 @@ Item
                 // Ensure that the cursor is at the first position. On some systems the text isnt fully visible
                 // Seems to have to do something with different dpi densities that QML doesn't quite handle.
                 // Another option would be to increase the size even further, but that gives pretty ugly results.
-                onTextChanged: cursorPosition = 0
+                onEditingFinished: cursorPosition = 0
                 style: TextFieldStyle
                 {
                     textColor: UM.Theme.getColor("setting_control_text");