Control: rename activeKeyFocus to visualFocus

This is a bit more flexible, because the name is not strictly coupled
with key focus. We can even add a (re)setter later if we want. This
change only renames the property.

Change-Id: I6707e44040f584480a8712df1af0915ae2829d57
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

7 files changed, 8 insertions, 8 deletions

diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 1be54234..6ef27a5a 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -77,7 +77,7 @@ T.Button {
         radius: 2
         color: !control.enabled ? (control.highlighted ? control.Material.raisedHighlightedButtonDisabledColor : control.Material.raisedButtonDisabledColor) :
             (control.down ? (control.highlighted ? control.Material.raisedHighlightedButtonPressColor : control.Material.raisedButtonPressColor) :
-            (control.activeKeyFocus ? (control.highlighted ? control.Material.raisedHighlightedButtonHoverColor : control.Material.raisedButtonHoverColor) :
+            (control.visualFocus ? (control.highlighted ? control.Material.raisedHighlightedButtonHoverColor : control.Material.raisedButtonHoverColor) :
             (control.highlighted ? control.Material.raisedHighlightedButtonColor : control.Material.raisedButtonColor)))
 
         Behavior on color {
@@ -90,7 +90,7 @@ T.Button {
             width: parent.width
             height: parent.height
             radius: parent.radius
-            visible: control.activeKeyFocus
+            visible: control.visualFocus
             color: control.Material.checkBoxUncheckedRippleColor
         }
 
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 49f4554e..a46994bc 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -107,7 +107,7 @@ T.ComboBox {
             width: parent.width
             height: parent.height
             radius: parent.radius
-            visible: control.activeKeyFocus
+            visible: control.visualFocus
             color: control.Material.checkBoxUncheckedRippleColor
         }
     }
diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml
index dbd950de..4090c732 100644
--- a/src/imports/controls/material/RadioIndicator.qml
+++ b/src/imports/controls/material/RadioIndicator.qml
@@ -54,7 +54,7 @@ Rectangle {
         height: width
         control: control
         colored: control.checked
-        opacity: control.down || control.activeKeyFocus ? 1 : 0
+        opacity: control.down || control.visualFocus ? 1 : 0
     }
 
     Rectangle {
diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml
index 8401bea5..d6280b67 100644
--- a/src/imports/controls/material/Slider.qml
+++ b/src/imports/controls/material/Slider.qml
@@ -56,7 +56,7 @@ T.Slider {
         x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
         y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))
         value: control.value
-        handleHasFocus: control.activeKeyFocus
+        handleHasFocus: control.visualFocus
         handlePressed: control.pressed
     }
     //! [handle]
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index 4dc666e7..858c914d 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -79,7 +79,7 @@ T.SwipeDelegate {
     background: Rectangle {
         color: !control.enabled ? control.Material.swipeDelegateDisabledColor :
             (control.down ? control.Material.swipeDelegatePressColor :
-            (control.activeKeyFocus || control.hovered ? control.Material.swipeDelegateHoverColor : control.Material.swipeDelegateColor))
+            (control.visualFocus || control.hovered ? control.Material.swipeDelegateHoverColor : control.Material.swipeDelegateColor))
 
         Behavior on x {
             enabled: !control.down
diff --git a/src/imports/controls/material/SwitchIndicator.qml b/src/imports/controls/material/SwitchIndicator.qml
index 403587b9..93b4c9f6 100644
--- a/src/imports/controls/material/SwitchIndicator.qml
+++ b/src/imports/controls/material/SwitchIndicator.qml
@@ -52,7 +52,7 @@ Item {
         width: handle.width
         height: width
         colored: control.checked
-        opacity: control.pressed || control.activeKeyFocus ? 1 : 0
+        opacity: control.pressed || control.visualFocus ? 1 : 0
     }
 
     Rectangle {
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index a02254c4..22a81c76 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -66,7 +66,7 @@ T.ToolButton {
         implicitHeight: 48
 
         color: control.down ? control.Material.flatButtonPressColor : control.Material.flatButtonFocusColor
-        visible: control.enabled && (control.down || control.activeKeyFocus || control.checked || control.highlighted)
+        visible: control.enabled && (control.down || control.visualFocus || control.checked || control.highlighted)
     }
     //! [background]
 }