Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/layoutMirroringInAdaptivePageLayout into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 2189
Merged at revision: 2189
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/layoutMirroringInAdaptivePageLayout
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 27 lines (+3/-3)
2 files modified
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+0/-3)
src/imports/Components/1.3/AdaptivePageLayout.qml (+3/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/layoutMirroringInAdaptivePageLayout
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zsombor Egri Approve
Adnane Belmadiaf (community) Approve
Review via email: mp+319833@code.launchpad.net

Commit message

Make AdaptivePageLayout handle layoutDirection out of the box

Description of the change

The AdaptivePageLayout has to flip depending on the layoutDirection. There's no need to do it on the application side and no need to do it on the MainView, so the toolkit gallery can actually drop that with this fix.

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

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: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Fair change, thx!

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2017-02-27 13:52:42 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2017-03-14 15:36:30 +0000
@@ -29,9 +29,6 @@
29 width: units.gu(120)29 width: units.gu(120)
30 height: units.gu(75)30 height: units.gu(75)
3131
32 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
33 LayoutMirroring.childrenInherit: true
34
35 AdaptivePageLayout {32 AdaptivePageLayout {
36 id: layout33 id: layout
37 anchors.fill: parent34 anchors.fill: parent
3835
=== modified file 'src/imports/Components/1.3/AdaptivePageLayout.qml'
--- src/imports/Components/1.3/AdaptivePageLayout.qml 2016-09-22 05:02:24 +0000
+++ src/imports/Components/1.3/AdaptivePageLayout.qml 2017-03-14 15:36:30 +0000
@@ -193,6 +193,9 @@
193PageTreeNode {193PageTreeNode {
194 id: layout194 id: layout
195195
196 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
197 LayoutMirroring.childrenInherit: true
198
196 Page {199 Page {
197 // AdaptivePageLayout has its own split headers, so200 // AdaptivePageLayout has its own split headers, so
198 // disable the application header.201 // disable the application header.

Subscribers

People subscribed via source and target branches