Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-make-use-of-frame into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Made use of new private Frame item for the focusing.

Made use of new private Frame item for the focusing.

[Zsombor Egri (zsombi)]

Small fix and we're good.

review: Needs Fixing

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-make-use-of-frame]

1816. By Loïc Molinari on 2016-01-21

Fixed color.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1815
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/124/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/286/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/124/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1815
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/126/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/287/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/126/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1816
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/125/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/288/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/125/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1816
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/127/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/289/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/127/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Thank you!!!!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1816
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/130/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/298/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/130/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1816
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/128/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/299/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/128/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2015-12-17 10:03:55 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml	2016-01-21 15:44:52 +0000
@@ -18,27 +18,19 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-
-UbuntuShape {
-    property color focusColor: UbuntuColors.orange // FIXME: Use color from palette
-
+import Ubuntu.Components.Private 1.3
+
+Frame {
     anchors.fill: parent
-    anchors.margins: -units.gu(0.4)
-    backgroundColor: Qt.rgba(focusColor.r, focusColor.g, focusColor.b, 1.0)
+    anchors.margins: -units.gu(0.46)
+    color: UbuntuColors.orange // FIXME: Use color from palette
+    thickness: units.gu(0.21)
+    radius: units.gu(1.7)
     visible: styledItem.keyNavigationFocus
-    z: styledItem.z - 1
-
-    UbuntuShape {
-        anchors.fill: parent
-        anchors.margins: styledItem.keyNavigationFocus ? units.gu(0.2) : 0
-        backgroundColor: theme.palette.normal.background
-        aspect: UbuntuShape.Flat
-        visible: parent.visible
-
-        Behavior on anchors.margins {
-            UbuntuNumberAnimation {
-                duration: UbuntuAnimation.FastDuration
-            }
+
+    Behavior on anchors.margins {
+        UbuntuNumberAnimation {
+            duration: UbuntuAnimation.FastDuration
         }
     }
 
@@ -49,4 +41,3 @@
         when: styledItem
     }
 }
-