Ubuntu UI Toolkit

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

  1. fix.1665942
  2. Merge into staging
Proposed by Adnane Belmadiaf on 2017-02-18
Status: Merged
Approved by: Christian Dywan on 2017-02-21
Approved revision: 2174
Merged at revision: 2177
Proposed branch: lp:~daker/ubuntu-ui-toolkit/fix.1665942
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 20 lines (+2/-1)
1 file modified
src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+2/-1)
To merge this branch: bzr merge lp:~daker/ubuntu-ui-toolkit/fix.1665942
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2017-02-21
Christian Dywan 2017-02-18 Approve on 2017-02-21
Review via email: mp+317711@code.launchpad.net

Commit Message

Fix PageHeader title alignment & elide in RTL mode

Description of the Change

Fix PageHeader title alignment & elide in RTL mode

To post a comment you must log in.
Christian Dywan (kalikiana) wrote :

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) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
2--- src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml 2016-09-19 07:24:45 +0000
3+++ src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml 2017-02-18 23:56:54 +0000
4@@ -121,6 +121,7 @@
5 id: titleLabel
6 objectName: "header_title_label"
7 text: styledItem.title
8+ horizontalAlignment: Qt.application.layoutDirection == Qt.RightToLeft ? Text.AlignRight: Text.AlignLeft
9
10 anchors {
11 left: parent.left
12@@ -131,7 +132,7 @@
13 color: pageHeaderStyle.foregroundColor
14 font.weight: pageHeaderStyle.fontWeight
15 textSize: pageHeaderStyle.textSize
16- elide: Text.ElideRight
17+ elide: Qt.application.layoutDirection == Qt.RightToLeft ? Text.ElideLeft: Text.ElideRight
18 }
19 }
20 }

Subscribers

People subscribed via source and target branches