1 files changed, 20 insertions, 3 deletions
diff --git a/resources/qml/Widgets/TextField.qml b/resources/qml/Widgets/TextField.qml
index b708446d65..085c7b7742 100644
--- a/resources/qml/Widgets/TextField.qml
+++ b/resources/qml/Widgets/TextField.qml
@@ -23,6 +23,8 @@ TextField
     selectByMouse: true
     font: UM.Theme.getFont("default")
     color: UM.Theme.getColor("text_field_text")
+    selectedTextColor: UM.Theme.getColor("text_field_text")
+    placeholderTextColor: UM.Theme.getColor("text_field_text_disabled")
     renderType: Text.NativeRendering
     selectionColor: UM.Theme.getColor("text_selection")
     leftPadding: iconLeft.visible ? iconLeft.width + UM.Theme.getSize("default_margin").width * 2 : UM.Theme.getSize("thin_margin").width
@@ -43,9 +45,24 @@ TextField
         },
         State
         {
+            name: "active"
+            when: control.activeFocus
+            PropertyChanges
+            {
+                target: backgroundRectangle
+                liningColor: UM.Theme.getColor("text_field_border_active")
+                borderColor: UM.Theme.getColor("text_field_border_active")
+            }
+        },
+        State
+        {
             name: "hovered"
-            when: control.hovered || control.activeFocus
-            PropertyChanges { target: backgroundRectangle; liningColor: UM.Theme.getColor("text_field_border_hovered")}
+            when: control.hovered && !control.activeFocus
+            PropertyChanges
+            {
+                target: backgroundRectangle
+                liningColor: UM.Theme.getColor("text_field_border_hovered")
+            }
         }
     ]
 
@@ -53,7 +70,7 @@ TextField
     {
         id: backgroundRectangle
         //Optional icon added on the left hand side.
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: iconLeft