Ubuntu UI Toolkit

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

  1. layoutMirroringInAdaptivePageLayout
  2. Merge into staging
Proposed by Christian Dywan on 2017-03-14
Status: Merged
Approved by: Zsombor Egri on 2017-03-14
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 on 2017-03-14
Zsombor Egri (community) 2017-03-14 Approve on 2017-03-14
Adnane Belmadiaf (community) Approve on 2017-03-14
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.
Adnane Belmadiaf (daker) wrote :

+1

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)
Zsombor Egri (zsombi) wrote :

Fair change, thx!

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
2--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2017-02-27 13:52:42 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml 2017-03-14 15:36:30 +0000
4@@ -29,9 +29,6 @@
5 width: units.gu(120)
6 height: units.gu(75)
7
8- LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
9- LayoutMirroring.childrenInherit: true
10-
11 AdaptivePageLayout {
12 id: layout
13 anchors.fill: parent
14
15=== modified file 'src/imports/Components/1.3/AdaptivePageLayout.qml'
16--- src/imports/Components/1.3/AdaptivePageLayout.qml 2016-09-22 05:02:24 +0000
17+++ src/imports/Components/1.3/AdaptivePageLayout.qml 2017-03-14 15:36:30 +0000
18@@ -193,6 +193,9 @@
19 PageTreeNode {
20 id: layout
21
22+ LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
23+ LayoutMirroring.childrenInherit: true
24+
25 Page {
26 // AdaptivePageLayout has its own split headers, so
27 // disable the application header.

Subscribers

People subscribed via source and target branches