From 86f8b578412bf0f905aa9df05f10bf794a72dc9b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 30 Jun 2016 15:16:28 -0700
Subject: [PATCH] Highlight controls based on activeFocus, not focus

---
 interface/resources/qml/controls-uit/SpinBox.qml   | 12 ++++++------
 interface/resources/qml/controls-uit/TextField.qml | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml
index 5d78cfc5a8..a1237d4bc7 100755
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controls-uit/SpinBox.qml
@@ -36,15 +36,15 @@ SpinBox {
         id: spinStyle
         background: Rectangle {
             color: isLightColorScheme
-                   ? (spinBox.focus ? hifi.colors.white : hifi.colors.lightGray)
-                   : (spinBox.focus ? hifi.colors.black : hifi.colors.baseGrayShadow)
+                   ? (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGray)
+                   : (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayShadow)
             border.color: spinBoxLabelInside.visible ? spinBoxLabelInside.color : hifi.colors.primaryHighlight
-            border.width: spinBox.focus ? spinBoxLabelInside.visible ? 2 : 1 : 0
+            border.width: spinBox.activeFocus ? spinBoxLabelInside.visible ? 2 : 1 : 0
         }
 
         textColor: isLightColorScheme
-                   ? (spinBox.focus ? hifi.colors.black : hifi.colors.lightGray)
-                   : (spinBox.focus ? hifi.colors.white : hifi.colors.lightGrayText)
+                   ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.lightGray)
+                   : (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
         selectedTextColor: hifi.colors.black
         selectionColor: hifi.colors.primaryHighlight
 
@@ -96,7 +96,7 @@ SpinBox {
         anchors.fill: parent
         propagateComposedEvents: true
         onWheel: {
-            if(spinBox.focus)
+            if(spinBox.activeFocus)
                 wheel.accepted = false
             else
                 wheel.accepted = true
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index 79027cdc3b..65fab00700 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -36,14 +36,14 @@ TextField {
 
     style: TextFieldStyle {
         textColor: isLightColorScheme
-                   ? (textField.focus ? hifi.colors.black : hifi.colors.lightGray)
-                   : (textField.focus ? hifi.colors.white : hifi.colors.lightGrayText)
+                   ? (textField.activeFocus ? hifi.colors.black : hifi.colors.lightGray)
+                   : (textField.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
         background: Rectangle {
             color: isLightColorScheme
-                   ? (textField.focus ? hifi.colors.white : hifi.colors.textFieldLightBackground)
-                   : (textField.focus ? hifi.colors.black : hifi.colors.baseGrayShadow)
+                   ? (textField.activeFocus ? hifi.colors.white : hifi.colors.textFieldLightBackground)
+                   : (textField.activeFocus ? hifi.colors.black : hifi.colors.baseGrayShadow)
             border.color: hifi.colors.primaryHighlight
-            border.width: textField.focus ? 1 : 0
+            border.width: textField.activeFocus ? 1 : 0
             radius: isSearchField ? textField.height / 2 : 0
 
             HiFiGlyphs {