Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textComponentsActiveFocus into lp:ubuntu-ui-toolkit/staging

[Christian Dywan]

Use activeFocus rather than focus to determine that Text* has focus

[Zsombor Egri (zsombi)]

Makes sense!

review: Approve

[Zsombor Egri (zsombi)]

Let's get the https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/04-apply-styleset/+merge/252467 as prereq, and please use theme instead of Theme.

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/textComponentsActiveFocus]

1480. By Christian Dywan on 2015-04-16

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

[Zsombor Egri (zsombi)]

Much better, much better :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2015-03-13 09:45:38 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2015-04-16 15:05:33 +0000
@@ -104,7 +104,7 @@
       text input. This property allows to control the highlight separately from
       the focused behavior.
       */
-    property bool highlighted: focus
+    property bool highlighted: activeFocus
     /*!
       Text that appears when there is no focus and no content in the component
       (hint text).

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-04-16 15:05:33 +0000
@@ -110,7 +110,7 @@
       text input. This property allows to control the highlight separately from
       the focused behavior.
       */
-    property bool highlighted: focus
+    property bool highlighted: activeFocus
 
     /*!
       Text that appears when there is no content in the component.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-04-09 09:42:36 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-04-16 15:05:33 +0000
@@ -25,13 +25,13 @@
     // FIXME: needs type checking in themes to define the proper type to be used
     // if color type is used, alpha value gets lost
 
-    property color color: (styledItem.focus || styledItem.highlighted) ? theme.palette.selected.fieldText : theme.palette.normal.fieldText
+    property color color: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.fieldText : theme.palette.normal.fieldText
     property color selectedTextColor: theme.palette.selected.foregroundText
     property color selectionColor: theme.palette.selected.foreground
     /*!
       Background fill color
       */
-    property color backgroundColor: (styledItem.focus || styledItem.highlighted) ? theme.palette.selected.field : theme.palette.normal.field
+    property color backgroundColor: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.field : theme.palette.normal.field
     property color errorColor: UbuntuColors.orange
 
     /*!