Merge lp:~daker/ubuntu-ui-toolkit/fix.1665942 into lp:ubuntu-ui-toolkit/staging

[Adnane Belmadiaf]

Fix PageHeader title alignment & elide in RTL mode

Fix PageHeader title alignment & elide in RTL mode

[Cris Dywan (kalikiana)]

I'm not entirely sure we should be querying Qt.application.layoutDirection here - but I reckon if need be, revisiting (wrong) uses of it will be greppy enough.

review: Approve

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

PASSED: Continuous integration, rev:2174
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1429/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7760/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1429/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2174
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1464/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7762/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2174
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1679/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7763/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2174
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/243/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/7764/console

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

review: Approve (continuous-integration)

=== modified file 'src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-09-19 07:24:45 +0000
+++ src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2017-02-18 23:56:54 +0000
@@ -121,6 +121,7 @@
                 id: titleLabel
                 objectName: "header_title_label"
                 text: styledItem.title
+                horizontalAlignment: Qt.application.layoutDirection == Qt.RightToLeft ? Text.AlignRight: Text.AlignLeft
 
                 anchors {
                     left: parent.left
@@ -131,7 +132,7 @@
                 color: pageHeaderStyle.foregroundColor
                 font.weight: pageHeaderStyle.fontWeight
                 textSize: pageHeaderStyle.textSize
-                elide: Text.ElideRight
+                elide: Qt.application.layoutDirection == Qt.RightToLeft ? Text.ElideLeft: Text.ElideRight
             }
         }
     }