ubuntu-sdk-team team mailing list archive

[Adnane Belmadiaf <adnane002@xxxxxxxxx>]

Adnane Belmadiaf has proposed merging lp:~daker/ubuntu-ui-toolkit/fix.1665942 into lp:ubuntu-ui-toolkit/staging.

Commit message:
Fix PageHeader title alignment & elide in RTL mode

Requested reviews:
  Ubuntu SDK team (ubuntu-sdk-team)
Related bugs:
  Bug #1665942 in ubuntu-ui-toolkit (Ubuntu): "PageHeader title should be aligned to the right in RTL mode"
  https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1665942

For more details, see:
https://code.launchpad.net/~daker/ubuntu-ui-toolkit/fix.1665942/+merge/317711

Fix PageHeader title alignment & elide in RTL mode
-- 
Your team Ubuntu SDK team is requested to review the proposed merge of lp:~daker/ubuntu-ui-toolkit/fix.1665942 into lp:ubuntu-ui-toolkit/staging.

=== 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
             }
         }
     }