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

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Cris Dywan
Approved revision: 2174
Merged at revision: 2178
Proposed branch: lp:~daker/ubuntu-ui-toolkit/fix.1665944
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 13 lines (+2/-1)
1 file modified
src/imports/Components/ListItems/1.3/LabelVisual.qml (+2/-1)
To merge this branch: bzr merge lp:~daker/ubuntu-ui-toolkit/fix.1665944
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+317712@code.launchpad.net

Commit message

Fix ListItem title/subtitle alignment & elide in RTL mode

Description of the change

Fix ListItem title/subtitle alignment & elide in RTL mode

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

I'm not entirely sure setting horizontalAlignment here is correct - but I'm prepared to accept it as-is and revisit it later if need be, I don't expect it to have other side effects.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
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/ListItems/1.3/LabelVisual.qml'
2--- src/imports/Components/ListItems/1.3/LabelVisual.qml 2016-01-27 13:58:29 +0000
3+++ src/imports/Components/ListItems/1.3/LabelVisual.qml 2017-02-19 00:26:41 +0000
4@@ -30,7 +30,8 @@
5 return item.parent.hasOwnProperty("pointerTarget") || label.isInsideOverlay(item.parent)
6 }
7
8- elide: Text.ElideRight
9+ horizontalAlignment: Qt.application.layoutDirection == Qt.RightToLeft ? Text.AlignRight: Text.AlignLeft
10+ elide: Qt.application.layoutDirection == Qt.RightToLeft ? Text.ElideLeft: Text.ElideRight
11 color: selected
12 ? theme.palette.selected.backgroundText
13 : (secondary

Subscribers

People subscribed via source and target branches