Ubuntu UI Toolkit

components.api (+3/-0)
examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml (+37/-3)
src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml (+4/-23)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+137/-45)
src/Ubuntu/Components/plugin/ucbottomedge.h (+7/-0)
src/Ubuntu/Components/plugin/ucbottomedge_p.h (+9/-3)
src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp (+146/-31)
src/Ubuntu/Components/plugin/ucbottomedgeregion.h (+38/-7)
tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml (+3/-1)
tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml (+3/-1)
tests/unit_x11/tst_bottomedge/PreloadedContent.qml (+60/-0)
tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp (+76/-0)
tests/unit_x11/tst_bottomedge/tst_bottomedge.pro (+3/-2)

To merge this branch:

bzr merge lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-03-01
Benjamin Zeller		2016-02-19	Approve on 2016-02-25
Review via email: mp+286670@code.launchpad.net

Commit message

BorromEdge.preloadContent

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1847
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/348/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1040/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/348/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1847
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/124/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1041/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/124/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1847
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/100/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1042/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/100/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-02-19

1848. By Zsombor Egri on 2016-02-19: adjust AsyncLoader changes
1849. By Zsombor Egri on 2016-02-19: API updated

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1847
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/358/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1053/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/358/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/49/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1849
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/125/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1055/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/125/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1849
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/349/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1056/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/349/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

FAILED: Continuous integration, rev:1849
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/359/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1057/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/359/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

PASSED: Continuous integration, rev:1849
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/101/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1058/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/101/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-19:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/50/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-02-20

1850. By Zsombor Egri on 2016-02-19: remove enum
1851. By Zsombor Egri on 2016-02-19: make things nicer and unified
1852. By Zsombor Egri on 2016-02-19: use BottomEdge context when creating the content
1853. By Zsombor Egri on 2016-02-20: tests added, content handling fixed
1854. By Zsombor Egri on 2016-02-20: adjust tests with deprecation warning so those are not shown anymore
1855. By Zsombor Egri on 2016-02-20: prereq sync

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

FAILED: Continuous integration, rev:1855
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/350/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1061/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/350/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

FAILED: Continuous integration, rev:1855
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/126/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1064/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/126/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

FAILED: Continuous integration, rev:1855
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/360/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1065/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/360/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

PASSED: Continuous integration, rev:1855
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/102/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1066/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/102/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/51/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-02-20

1856. By Zsombor Egri on 2016-02-20: reshape gallery page

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

FAILED: Continuous integration, rev:1856
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/352/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1070/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/352/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

FAILED: Continuous integration, rev:1856
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/128/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1071/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/128/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

FAILED: Continuous integration, rev:1856
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/362/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1072/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/362/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

PASSED: Continuous integration, rev:1856
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/104/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1073/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/104/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-20:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/53/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-02-24

1857. By Zsombor Egri on 2016-02-24: prereq sync

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-24:

PASSED: Continuous integration, rev:1857
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/374/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1177/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/374/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-24:

PASSED: Continuous integration, rev:1857
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/150/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1178/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/150/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-24:

PASSED: Continuous integration, rev:1857
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/384/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1183/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/384/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-24:

PASSED: Continuous integration, rev:1857
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/128/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1185/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/128/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-24:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/70/rebuild

review: Approve (continuous-integration)

Revision history for this message

Benjamin Zeller (zeller-benjamin) wrote on 2016-02-24:

Just 2 inline comments

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2016-02-25:

See my reply below.

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-02-25

1858. By Zsombor Egri on 2016-02-25: prereq sync
1859. By Zsombor Egri on 2016-02-25: turn off logs

Revision history for this message

Benjamin Zeller (zeller-benjamin) wrote on 2016-02-25:

LGTM

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-25:

FAILED: Continuous integration, rev:1859
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/389/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1252/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/389/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-25:

FAILED: Continuous integration, rev:1859
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/165/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1253/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/165/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-25:

FAILED: Continuous integration, rev:1859
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/399/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1254/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/399/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-25:

PASSED: Continuous integration, rev:1859
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/143/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1256/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/143/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-25:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/82/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-02-29

1860. By Zsombor Egri on 2016-02-29: prereq sync

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-29:

PASSED: Continuous integration, rev:1860
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/410/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1347/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/410/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-29:

FAILED: Continuous integration, rev:1860
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/420/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1351/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/420/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-29:

PASSED: Continuous integration, rev:1860
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/186/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1352/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/186/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-29:

PASSED: Continuous integration, rev:1860
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/164/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1356/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/164/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-02-29:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/96/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent updated on 2016-03-01

1861. By Zsombor Egri on 2016-03-01: prereq sync

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/190/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1370/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/190/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/414/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1371/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/414/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/424/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1374/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/424/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/168/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1375/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/168/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/98/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/418/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1389/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/418/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/194/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1390/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/194/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/428/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1391/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/428/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-03-01:

PASSED: Continuous integration, rev:1861
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/172/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1392/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/172/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

 === modified file 'components.api'
 --- components.api	2016-02-24 13:18:49 +0000
 +++ components.api	2016-03-01 10:46:21 +0000
@@ -197,6 +197,7 @@
      signal collapseCompleted()
      function commit()
      function collapse()
++    property bool preloadContent
      property list<BottomEdgeRegion> regions
      readonly property Status status
  Ubuntu.Components.BottomEdge.DragDirection: Enum
@@ -223,6 +224,8 @@
      property url contentUrl
      property bool enabled
      property double from
++    signal contentChanged(url url)
++    signal contentComponentChanged(Component component)
      signal entered()
      signal exited()
      signal dragEnded()
 === modified file 'examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml'
 --- examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2016-01-13 16:07:58 +0000
 +++ examples/ubuntu-ui-toolkit-gallery/BottomEdgePage.qml	2016-03-01 10:46:21 +0000
@@ -36,7 +36,7 @@
                  spacing: units.gu(1)
                  CheckBox {
                      id: contentToLayout
--                    text: i18n.tr("push content into the layout")
++                    text: i18n.tr("push content into the column")
                      enabled: bottomEdge.hint.status >= BottomEdgeHint.Active
+                 }
                  Label {
@@ -52,20 +52,38 @@
          className: "BottomEdge"
          TemplateRow {
++            title: i18n.tr("Content")
++            Row {
++                spacing: units.gu(1)
++                CheckBox {
++                    id: preloadContent
++                    text: i18n.tr("preload content")
++                    checked: bottomEdge.preloadContent
++                    onTriggered: bottomEdge.preloadContent = checked
++                }
++                Label {
++                    text: preloadContent.text
++                    anchors.verticalCenter: preloadContent.verticalCenter
++                }
++            }
++        }
++
++        TemplateFlow {
              title: i18n.tr("Top")
              Slider {
                  id: bottomEdgeHeight
++                width: Math.min(units.gu(30), parent.width)
                  maximumValue: page.height
                  value: bottomEdge.height
                  onValueChanged: bottomEdge.height = value
+             }
+         }
--        TemplateRow {
++        TemplateFlow {
              title: i18n.tr("Regions")
              Slider {
                  id: regionCount
--                width: units.gu(20)
++                width: Math.min(units.gu(20), parent.width)
                  maximumValue: 3.0
                  live: true
+             }
@@ -133,12 +151,28 @@
                  enabled: regionConfig.model >= 1
                  to: 0.3
                  property color baseColor: UbuntuColors.silk
++                contentComponent: Rectangle {
++                    PageHeader {
++                        title: i18n.tr("CustomRegion #1")
++                    }
++                    width: bottomEdge.width - units.gu(10)
++                    height: bottomEdge.height
++                    color: UbuntuColors.blue
++                }
              },
              BottomEdgeRegion {
                  objectName: "CustomRegion2"
                  enabled: regionConfig.model >= 2
                  from: 0.3
                  to: 0.6
++                contentComponent: Rectangle {
++                    PageHeader {
++                        title: i18n.tr("CustomRegion #2")
++                    }
++                    width: bottomEdge.width - units.gu(30)
++                    height: bottomEdge.height
++                    color: UbuntuColors.red
++                }
              },
              BottomEdgeRegion {
                  objectName: "CustomRegion3"
 === modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml'
 --- src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2015-12-14 09:16:41 +0000
 +++ src/Ubuntu/Components/Themes/Ambiance/1.3/BottomEdgeStyle.qml	2016-03-01 10:46:21 +0000
@@ -22,10 +22,12 @@
      //setup properties
      property BottomEdge bottomEdge: styledItem
      panel: panelItem
--    contentItem: loader.item
      panelAnimation: panelBehavior
      revealThreshold: bottomEdge.hint.height + units.gu(2)
++    //deprecated for now
++    contentItem: bottomEdge.contentItem
++
      // own styling properties
      property color backgroundColor: !panelItem.collapsing
                                      ? Qt.rgba(0, 0, 0, Math.min(0.25, (height - revealThreshold - panelItem.y) / (height - revealThreshold)))
@@ -54,7 +56,7 @@
                         ? -(bottomEdge.height * bottomEdge.dragProgress)
                         : 0
+         }
--        height: loader.item ? loader.item.height : 0
++        height: bottomEdge.contentItem ? bottomEdge.contentItem.height : 0
          color: panelColor
          opacity: bottomEdge.status >= BottomEdge.Revealed ? 1.0 : 0.0
@@ -108,26 +110,5 @@
                  GradientStop { position: 1.0; color: Qt.rgba(shadowColor.r, shadowColor.g, shadowColor.b, 0.1) }
+             }
+         }
--
--        // content
--        Loader {
--            id: loader
--            anchors.horizontalCenter: parent.horizontalCenter
--            asynchronous: true
--            source: bottomEdge.status > BottomEdge.Hidden ? bottomEdge.contentUrl : ""
--            sourceComponent: bottomEdge.status > BottomEdge.Hidden ? bottomEdge.contentComponent : null
--            onItemChanged: {
--                if (item) {
--                    item.parent = panelItem;
--                    item.anchors.horizontalCenter = panelItem.horizontalCenter;
--                }
--            }
--
--            Connections {
--                target: bottomEdge
--                onCommitStarted: loader.asynchronous = false
--                onCommitCompleted: loader.asynchronous = true
--            }
--        }
+     }
+ }
 === modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
 --- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-01-25 12:23:03 +0000
 +++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-03-01 10:46:21 +0000
@@ -37,15 +37,15 @@
  #include "private/ucswipearea_p.h"
  #include <QtQuick/private/qquickanimation_p.h>
++using namespace UbuntuToolkit;
++
  Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg)
--#define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
--
  UCBottomEdgePrivate::UCBottomEdgePrivate()
      : UCStyledItemBasePrivate()
++    , defaultRegion(new UCBottomEdgeRegion(nullptr, true))
      , activeRegion(Q_NULLPTR)
      , hint(new UCBottomEdgeHint)
--    , contentComponent(Q_NULLPTR)
      , bottomPanel(Q_NULLPTR)
      , previousDistance(0.0)
      , dragProgress(0.)
@@ -54,6 +54,7 @@
      , dragDirection(UCBottomEdge::Undefined)
      , defaultRegionsReset(false)
      , mousePressed(false)
++    , preloadContent(false)
+ {
+ }
@@ -67,8 +68,20 @@
          hint->setEnabled2(q->isEnabled());
      });
--    // create default regions
--    createDefaultRegions();
++    // create default region
++    // for testing purposes
++    defaultRegion->setObjectName("default_BottomEdgeRegion");
++    // enters in this stage when drag ratio reaches 30% of the area
++    defaultRegion->m_from = 0.33;
++    defaultRegion->m_to = 1.0;
++    defaultRegion->attachToBottomEdge(q);
++
++    QObject::connect(defaultRegion, &UCBottomEdgeRegion::contentChanged,
++                     q, &UCBottomEdge::contentChanged);
++    QObject::connect(defaultRegion, &UCBottomEdgeRegion::contentComponentChanged,
++                     q, &UCBottomEdge::contentComponentChanged);
++
++    regions.append(defaultRegion);
      // set the style name
      styleDocument = QStringLiteral("BottomEdgeStyle");
@@ -124,13 +137,17 @@
      if (!defaultRegionsReset) {
          defaultRegionsReset = true;
--        qDeleteAll(regions);
          regions.clear();
+     }
      // validate the region before we append
      validateRegion(region);
++    // if preload is set, load content
++    if (preloadContent) {
++        region->loadRegionContent();
++    }
++
      // append region definition
      regions.append(region);
+ }
@@ -146,7 +163,7 @@
+     }
      regions.clear();
      defaultRegionsReset = false;
--    createDefaultRegions();
++    regions.append(defaultRegion);
+ }
  // validates an added region
@@ -186,21 +203,6 @@
+     }
+ }
--// creates the default region(s)
--void UCBottomEdgePrivate::createDefaultRegions()
--{
--    Q_Q(UCBottomEdge);
--    // add the default stages
--    UCBottomEdgeRegion *commitRegion = new UCBottomEdgeRegion(q);
--    // for testing purposes
--    commitRegion->setObjectName("default_BottomEdgeRegion");
--    // enters in this stage when drag ratio reaches 30% of the area
--    commitRegion->m_from = 0.33;
--    commitRegion->m_to = 1.0;
--
--    regions.append(commitRegion);
--}
--
  // update status, drag direction and activeRegion during drag
  void UCBottomEdgePrivate::updateProgressionStates(qreal distance)
+ {
@@ -352,6 +354,8 @@
+         }
          break;
      case UCBottomEdgePrivate::Collapsing:
++        // no active region when collapsed!
++        d->setActiveRegion(nullptr);
          d->setStatus(UCBottomEdge::Hidden);
          Q_EMIT collapseCompleted();
          break;
@@ -392,11 +396,12 @@
  void UCBottomEdgePrivate::patchContentItemHeader()
+ {
      // ugly, as it can be, as we don't have the PageHeader in cpp to detect the type
--    UCHeader *header = bottomPanel->m_contentItem ? bottomPanel->m_contentItem->findChild<UCHeader*>() : Q_NULLPTR;
++    UCHeader *header = currentContentItem ? currentContentItem->findChild<UCHeader*>() : Q_NULLPTR;
      if (!header || !QuickUtils::inherits(header, "PageHeader")) {
          return;
+     }
++    LOG << "PATCH HEADER" << currentContentItem.data();
      // get the navigationActions and inject an action there
      QVariant list(header->property("navigationActions"));
      QQmlListProperty<UCAction> actions = list.value< QQmlListProperty<UCAction> >();
@@ -453,14 +458,6 @@
          hint->setParentItem(bottomPanel);
          // and stack it before the panel, so it is covered by the panel when revealed
          hint->stackBefore(bottomPanel->m_panel);
--
--        // connect style stuff
--        QObject::connect(bottomPanel, &UCBottomEdgeStyle::contentItemChanged,
--                         q, &UCBottomEdge::contentItemChanged, Qt::DirectConnection);
--        // follow contentItem change to patch the header
--        QObject::connect(bottomPanel, &UCBottomEdgeStyle::contentItemChanged, [=]() {
--            patchContentItemHeader();
--        });
+     }
      return result;
+ }
@@ -749,6 +746,10 @@
+ {
      UCStyledItemBasePrivate::completeComponentInitialization();
      Q_Q(UCBottomEdge);
++    // trigger default region content loading; the default region content is
++    // always pre-loaded
++    defaultRegion->loadRegionContent();
++
      // fix the hint's style version as that has no qmlContext of its own
      // and thus import version check will fail; setting the context for
      // the hint using this component's hint won't work either as this
@@ -931,6 +932,13 @@
+     }
      Q_EMIT q_func()->statusChanged(this->status);
++
++    // show content
++    if (status > UCBottomEdge::Hidden) {
++        setCurrentContent();
++    } else {
++        resetCurrentContent(nullptr);
++    }
+ }
  /*!
@@ -941,17 +949,12 @@
  QUrl UCBottomEdge::contentUrl() const
+ {
      Q_D(const UCBottomEdge);
--    return d->contentUrl;
++    return d->defaultRegion->m_url;
+ }
  void UCBottomEdge::setContent(const QUrl &url)
+ {
      Q_D(UCBottomEdge);
--    if (d->contentUrl == url) {
--        return;
--    }
--
--    d->contentUrl = url;
--    Q_EMIT contentChanged(d->contentUrl);
++    d->defaultRegion->setUrl(url);
+ }
  /*!
@@ -962,16 +965,12 @@
  QQmlComponent *UCBottomEdge::contentComponent() const
+ {
      Q_D(const UCBottomEdge);
--    return d->contentComponent;
++    return d->defaultRegion->m_component;
+ }
  void UCBottomEdge::setContentComponent(QQmlComponent *component)
+ {
      Q_D(UCBottomEdge);
--    if (d->contentComponent == component) {
--        return;
--    }
--    d->contentComponent = component;
--    Q_EMIT contentComponentChanged(d->contentComponent);
++    d->defaultRegion->setComponent(component);
+ }
  /*!
@@ -983,7 +982,7 @@
  QQuickItem *UCBottomEdge::contentItem() const
+ {
      Q_D(const UCBottomEdge);
--    return d->bottomPanel ? d->bottomPanel->m_contentItem : Q_NULLPTR;
++    return d->currentContentItem.data();
+ }
  /*!
@@ -1082,4 +1081,97 @@
      return d->activeRegion;
+ }
++/*!
++ * \qmlproperty bool BottomEdge::preloadContent
++ * If set, all the contents set in the component and in regions will be loaded
++ * in the background, so it will be available before it is revealed.
++ */
++bool UCBottomEdge::preloadContent() const
++{
++    return d_func()->preloadContent;
++}
++void UCBottomEdge::setPreloadContent(bool value)
++{
++    Q_D(UCBottomEdge);
++    if (d->preloadContent == value) {
++        return;
++    }
++    d->preloadContent = value;
++
++    if (d->preloadContent) {
++        // we load all region's content, but we skip teh default one,
++        // as default one is always preloaded
++        for (int i = 0; i < d->regions.size(); i++) {
++            UCBottomEdgeRegion *region = d->regions[i];
++            if (region == d->defaultRegion) {
++                continue;
++            }
++            region->loadRegionContent();
++        }
++    } else {
++        // discard all inactive regions content, except default one
++        for (int i = 0; i < d->regions.size(); i++) {
++            UCBottomEdgeRegion *region = d->regions[i];
++            if (region != d->activeRegion && region != d->defaultRegion) {
++                region->discardRegionContent();
++            }
++        }
++    }
++
++    Q_EMIT preloadContentChanged();
++}
++
++/*
++ * Set the current content. The content is taken from the region if active, or foced
++ * is set. If the region has no item, the logic falls back to use the default region's
++ * content.
++ */
++void UCBottomEdgePrivate::setCurrentContent()
++{
++    QQuickItem *newContent = nullptr;
++    if (activeRegion) {
++        newContent = activeRegion->regionContent();
++        LOG << "ACTIVE REGION CONTENT" << activeRegion->objectName() << newContent;
++    }
++    if (!newContent) {
++        newContent = defaultRegion->regionContent();
++        LOG << "USING DEFAULT" << newContent;
++    }
++    resetCurrentContent(newContent);
++}
++/*
++ * Set the content to the default region one.
++ */
++void UCBottomEdgePrivate::resetCurrentContent(QQuickItem *newContent)
++{
++    if (newContent == currentContentItem) {
++        // same content, no need to reset to
++        return;
++    }
++    if (currentContentItem) {
++        // detach current content, the content will be deleted by the exiting region
++        currentContentItem->setVisible(false);
++        currentContentItem->setParentItem(nullptr);
++    }
++
++    if (!newContent) {
++        // try to use the default one
++        newContent = defaultRegion->regionContent();
++    }
++
++    // if it is still null, leave - we may not have default content at all!
++    if (!newContent) {
++        return;
++    }
++
++    LOG << "RESET CONTENT TO" << newContent;
++    currentContentItem = newContent;
++    currentContentItem->setParentItem(bottomPanel->m_panel);
++    QQuickAnchors *anchors = QQuickItemPrivate::get(currentContentItem.data())->anchors();
++    anchors->setHorizontalCenter(QQuickItemPrivate::get(bottomPanel->m_panel)->horizontalCenter());
++    currentContentItem->setVisible(true);
++    Q_EMIT q_func()->contentItemChanged();
++    patchContentItemHeader();
++}
++
  #include "moc_ucbottomedge.cpp"
 === modified file 'src/Ubuntu/Components/plugin/ucbottomedge.h'
 --- src/Ubuntu/Components/plugin/ucbottomedge.h	2015-12-11 12:10:54 +0000
 +++ src/Ubuntu/Components/plugin/ucbottomedge.h	2016-03-01 10:46:21 +0000
@@ -42,6 +42,7 @@
      Q_PROPERTY(QQuickItem* contentItem READ contentItem NOTIFY contentItemChanged FINAL)
      Q_PROPERTY(QQmlListProperty<UCBottomEdgeRegion> regions READ regions NOTIFY regionsChanged FINAL)
      Q_PROPERTY(UCBottomEdgeRegion* activeRegion READ activeRegion NOTIFY activeRegionChanged FINAL)
++    Q_PROPERTY(bool preloadContent READ preloadContent WRITE setPreloadContent NOTIFY preloadContentChanged FINAL DESIGNABLE false)
      // overloaded data property to catch regions
      Q_PRIVATE_PROPERTY(UCBottomEdge::d_func(), QQmlListProperty<QObject> data READ data DESIGNABLE false)
@@ -73,6 +74,8 @@
      void setFillWindow(bool fill);
      QQmlListProperty<UCBottomEdgeRegion> regions();
      UCBottomEdgeRegion *activeRegion();
++    bool preloadContent() const;
++    void setPreloadContent(bool value);
  Q_SIGNALS:
      void dragProgressChanged(qreal dragProgress);
@@ -83,6 +86,7 @@
      void contentItemChanged();
      void regionsChanged();
      void activeRegionChanged(UCBottomEdgeRegion *activeRegion);
++    void preloadContentChanged();
      void commitStarted();
      void commitCompleted();
@@ -109,6 +113,7 @@
      Q_DECLARE_PRIVATE(UCBottomEdge)
++private:
      friend class tst_BottomEdge;
  };
  Q_DECLARE_METATYPE(UCBottomEdge::Status)
@@ -116,4 +121,6 @@
  Q_DECLARE_LOGGING_CATEGORY(ucBottomEdge)
++#define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
++
  #endif // UCBOTTOMEDGE_H
 === modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
 --- src/Ubuntu/Components/plugin/ucbottomedge_p.h	2015-12-21 17:49:59 +0000
 +++ src/Ubuntu/Components/plugin/ucbottomedge_p.h	2016-03-01 10:46:21 +0000
@@ -23,6 +23,10 @@
  #include "ucstyleditembase_p.h"
  #include "ucaction.h"
++#include <AsyncLoader>
++
++using namespace UbuntuToolkit;
++
  class UCBottomEdgeStyle;
  class UCBottomEdgePrivate : public UCStyledItemBasePrivate, protected QQuickItemChangeListener
+ {
@@ -51,7 +55,6 @@
      // page header manipulation
      void patchContentItemHeader();
--    void createDefaultRegions();
      void updateProgressionStates(qreal distance);
      bool setActiveRegion(UCBottomEdgeRegion *range);
      void detectDirection(qreal currentDistance);
@@ -70,12 +73,14 @@
      void itemChildAdded(QQuickItem *item, QQuickItem *child);
      void itemChildRemoved(QQuickItem *item, QQuickItem *child);
++    void setCurrentContent();
++    void resetCurrentContent(QQuickItem *newItem);
      // members
--    QUrl contentUrl;
      QList<UCBottomEdgeRegion*> regions;
++    QPointer<QQuickItem> currentContentItem;
++    UCBottomEdgeRegion *defaultRegion;
      UCBottomEdgeRegion *activeRegion;
      UCBottomEdgeHint *hint;
--    QQmlComponent *contentComponent;
      UCBottomEdgeStyle *bottomPanel;
      qreal previousDistance;
@@ -93,6 +98,7 @@
      bool defaultRegionsReset:1;
      bool mousePressed:1;
++    bool preloadContent:1;
      // status management
      void setOperationStatus(OperationStatus s);
 === modified file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp'
 --- src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2015-11-26 15:49:24 +0000
 +++ src/Ubuntu/Components/plugin/ucbottomedgeregion.cpp	2016-03-01 10:46:21 +0000
@@ -91,16 +91,19 @@
   * properties will cause unpredictable results.
   */
--UCBottomEdgeRegion::UCBottomEdgeRegion(QObject *parent)
++UCBottomEdgeRegion::UCBottomEdgeRegion(QObject *parent, bool isDefault)
      : QObject(parent)
      , m_bottomEdge(qobject_cast<UCBottomEdge*>(parent))
      , m_component(Q_NULLPTR)
--    , m_urlBackup(Q_NULLPTR)
--    , m_componentBackup(Q_NULLPTR)
++    , m_contentItem(Q_NULLPTR)
      , m_from(0.0)
      , m_to(-1.0)
      , m_enabled(true)
++    , m_active(false)
++    , m_default(isDefault)
+ {
++    connect(&m_loader, &UbuntuToolkit::AsyncLoader::loadingStatus,
++            this, &UCBottomEdgeRegion::onLoaderStatusChanged);
+ }
  void UCBottomEdgeRegion::attachToBottomEdge(UCBottomEdge *bottomEdge)
@@ -121,41 +124,40 @@
  void UCBottomEdgeRegion::enter()
+ {
++    m_active = true;
      Q_EMIT entered();
--    // backup url
--    if (m_url.isValid()) {
--        m_urlBackup = new PropertyChange(m_bottomEdge, "contentUrl");
--        QQmlProperty property(this, "contentUrl", qmlContext(this));
--        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
--        if (binding) {
--            PropertyChange::setBinding(m_urlBackup, binding);
--        } else {
--            PropertyChange::setValue(m_urlBackup, m_url);
--        }
--    }
--    if (m_component) {
--        m_componentBackup = new PropertyChange(m_bottomEdge, "contentComponent");
--        QQmlProperty property(this, "contentComponent", qmlContext(this));
--        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(property);
--        if (binding) {
--            PropertyChange::setBinding(m_componentBackup, binding);
--        } else {
--            PropertyChange::setValue(m_componentBackup, QVariant::fromValue<QQmlComponent*>(m_component));
--        }
++
++    LOG << "ENTER REGION" << objectName();
++    // if preloaded, or default(?), set the content
++    if (m_bottomEdge->preloadContent() || m_default) {
++        if (m_loader.status() == UbuntuToolkit::AsyncLoader::Ready) {
++            LOG << "SET REGION CONTENT" << objectName();
++            UCBottomEdgePrivate::get(m_bottomEdge)->setCurrentContent();
++        }
++    } else {
++        // initiate loading, component has priority
++        loadRegionContent();
+     }
+ }
  void UCBottomEdgeRegion::exit()
+ {
--    if (m_componentBackup) {
--        delete m_componentBackup;
--        m_componentBackup = Q_NULLPTR;
--    }
--    if (m_urlBackup) {
--        delete m_urlBackup;
--        m_urlBackup = Q_NULLPTR;
--    }
++    m_active = false;
      Q_EMIT exited();
++
++    // detach content from BottomEdge
++    LOG << "EXIT REGION" << objectName();
++    UCBottomEdgePrivate::get(m_bottomEdge)->resetCurrentContent(nullptr);
++
++    // then cleanup
++    if (!m_contentItem) {
++        return;
++    }
++    LOG << "RESET REGION CONTENT" << objectName();
++    if (!m_bottomEdge->preloadContent()) {
++        LOG << "DISCARD REGION CONTENT" << objectName();
++        discardRegionContent();
++    }
+ }
  const QRectF UCBottomEdgeRegion::rect(const QRectF &bottomEdgeRect)
@@ -166,6 +168,86 @@
      return regionRect;
+ }
++void UCBottomEdgeRegion::loadRegionContent()
++{
++    if (!m_enabled) {
++        return;
++    }
++    LOG << "LOAD REGION CONTENT" << objectName();
++    if (m_component) {
++        loadContent(LoadingComponent);
++    } else if (m_url.isValid()) {
++        loadContent(LoadingUrl);
++    }
++}
++
++void UCBottomEdgeRegion::loadContent(LoadingType type)
++{
++    // we must delete the previous content before we (re)initiate loading
++    if (m_contentItem) {
++        m_contentItem->deleteLater();;
++        m_contentItem = nullptr;
++    }
++    // no need to create new context as we do not set any context properties
++    // for which we would need one
++    switch (type) {
++    case LoadingUrl:
++        m_loader.load(m_url, qmlContext(m_bottomEdge));
++        return;
++    case LoadingComponent:
++        m_loader.load(m_component, qmlContext(m_bottomEdge));
++        return;
++    }
++}
++
++void UCBottomEdgeRegion::discardRegionContent()
++{
++    m_loader.reset();
++    if (m_contentItem) {
++        LOG << "DISCARD CONTENT" << objectName();
++        m_contentItem->deleteLater();
++    }
++    m_contentItem = nullptr;
++}
++
++QQuickItem *UCBottomEdgeRegion::regionContent()
++{
++    return m_contentItem;
++}
++
++void UCBottomEdgeRegion::onLoaderStatusChanged(UbuntuToolkit::AsyncLoader::LoadingStatus status, QObject *object)
++{
++    bool emitChange = false;
++    LOG << "STATUS" << status << object;
++    if (status == UbuntuToolkit::AsyncLoader::Ready) {
++        // if we are no longer active, no need to continue, and discard content
++        // this may occur when the component was still in Compiling state while
++        // the region was exited, therefore reset() could not cancel the operation.
++        if (!m_active && !m_default && !m_bottomEdge->preloadContent()) {
++            LOG << "DELETE REGION CONTENT" << objectName();
++            object->deleteLater();
++            return;
++        }
++        m_contentItem = qobject_cast<QQuickItem*>(object);
++        emitChange = m_active || m_default;
++    }
++
++    if (status == UbuntuToolkit::AsyncLoader::Reset) {
++        // de-parent first
++        if (m_contentItem) {
++            m_contentItem->setParentItem(nullptr);
++            LOG << "RESET CONTENT" << objectName();
++            m_contentItem->deleteLater();
++        }
++        m_contentItem = nullptr;
++        emitChange = true;
++    }
++
++    if (emitChange && m_bottomEdge && m_active) {
++        UCBottomEdgePrivate::get(m_bottomEdge)->setCurrentContent();
++    }
++}
++
  /*!
   * \qmlproperty bool BottomEdgeRegion::enabled
   * Enables the section. Disabled sections do not trigger nor change the BottomEdge
@@ -180,6 +262,15 @@
      if (m_bottomEdge) {
          UCBottomEdgePrivate::get(m_bottomEdge)->validateRegion(this);
+     }
++
++    // load content if preload is set
++    if (m_bottomEdge->preloadContent()) {
++        if (!m_enabled) {
++            discardRegionContent();
++        } else {
++            loadRegionContent();
++        }
++    }
      Q_EMIT enabledChanged();
+ }
@@ -227,6 +318,18 @@
   * when the drag gesture enters the section area. The orginal value will be restored
   * once the gesture leaves the section area.
   */
++void UCBottomEdgeRegion::setUrl(const QUrl &url)
++{
++    if (m_url == url) {
++        return;
++    }
++    m_url = url;
++    Q_EMIT contentChanged(m_url);
++    // invoke loader if the preload is set
++    if (m_bottomEdge && (m_bottomEdge->preloadContent() || m_default) && !m_url.isValid()) {
++        loadContent(LoadingUrl);
++    }
++}
  /*!
   * \qmlproperty Component BottomEdgeRegion::contentComponent
@@ -235,6 +338,18 @@
   * when the drag gesture enters the section area. The orginal value will be restored
   * once the gesture leaves the section area.
   */
++void UCBottomEdgeRegion::setComponent(QQmlComponent *component)
++{
++    if (m_component == component) {
++        return;
++    }
++    m_component = component;
++    Q_EMIT contentComponentChanged(m_component);
++    // invoke loader if the preload is set
++    if (m_bottomEdge && (m_bottomEdge->preloadContent() || m_default) && m_component) {
++        loadContent(LoadingComponent);
++    }
++}
  /*!
   * \qmlsignal void BottomEdgeRegion::entered()
 === modified file 'src/Ubuntu/Components/plugin/ucbottomedgeregion.h'
 --- src/Ubuntu/Components/plugin/ucbottomedgeregion.h	2015-11-26 15:49:24 +0000
 +++ src/Ubuntu/Components/plugin/ucbottomedgeregion.h	2016-03-01 10:46:21 +0000
@@ -23,6 +23,8 @@
  #include <QtQml/QQmlParserStatus>
  #include <QtCore/QUrl>
  #include <QtCore/QPointer>
++#include <QtQml/QQmlIncubator>
++#include <AsyncLoader>
  class UCBottomEdge;
  class QQmlComponent;
@@ -34,13 +36,15 @@
      Q_PROPERTY(bool enabled MEMBER m_enabled WRITE setEnabled NOTIFY enabledChanged FINAL)
      Q_PROPERTY(qreal from MEMBER m_from WRITE setFrom NOTIFY fromChanged FINAL)
      Q_PROPERTY(qreal to MEMBER m_to WRITE setTo NOTIFY toChanged FINAL)
--    Q_PROPERTY(QUrl contentUrl MEMBER m_url NOTIFY contentChanged FINAL)
--    Q_PROPERTY(QQmlComponent* contentComponent MEMBER m_component NOTIFY contentComponentChanged FINAL)
++    Q_PROPERTY(QUrl contentUrl MEMBER m_url WRITE setUrl NOTIFY contentChanged FINAL)
++    Q_PROPERTY(QQmlComponent* contentComponent MEMBER m_component WRITE setComponent NOTIFY contentComponentChanged FINAL)
  public:
--    explicit UCBottomEdgeRegion(QObject *parent = 0);
++    explicit UCBottomEdgeRegion(QObject *parent = 0, bool isDefault = false);
      void attachToBottomEdge(UCBottomEdge *bottomEdge);
      // used internally
++    void setUrl(const QUrl &url);
++    void setComponent(QQmlComponent *component);
      void setFrom(qreal from);
      void setTo(qreal to);
      void setEnabled(bool enabled);
@@ -49,30 +53,57 @@
      void exit();
      const QRectF rect(const QRectF &bottomEdgeRect);
++    // not exposed to QML
++    bool isActive()
++    {
++        return m_active;
++    }
++    bool isDefault()
++    {
++        return m_default;
++    }
++
++    QQuickItem *regionContent();
++    inline const UbuntuToolkit::AsyncLoader *loader()
++    {
++        return const_cast<const UbuntuToolkit::AsyncLoader*>(&m_loader);
++    }
++
  Q_SIGNALS:
      void enabledChanged();
      void fromChanged();
      void toChanged();
--    void contentChanged();
--    void contentComponentChanged();
++    void contentChanged(const QUrl &url);
++    void contentComponentChanged(QQmlComponent *component);
      void entered();
      void exited();
      void dragEnded();
  protected:
++    enum LoadingType {
++        LoadingUrl,
++        LoadingComponent
++    };
++    UbuntuToolkit::AsyncLoader m_loader;
      QUrl m_url;
      QPointer<UCBottomEdge> m_bottomEdge;
      QQmlComponent *m_component;
--    PropertyChange *m_urlBackup;
--    PropertyChange *m_componentBackup;
++    QQuickItem *m_contentItem;
      qreal m_from;
      qreal m_to;
      bool m_enabled:1;
++    bool m_active:1;
++    const bool m_default:1;
      friend class UCBottomEdge;
      friend class UCBottomEdgePrivate;
      friend class tst_BottomEdge;
++
++    void loadRegionContent();
++    void discardRegionContent();
++    void loadContent(LoadingType type);
++    Q_SLOT void onLoaderStatusChanged(UbuntuToolkit::AsyncLoader::LoadingStatus,QObject*);
  };
  #endif // UCBOTTOMEDGEREGION_H
 === modified file 'tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml'
 --- tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml	2015-11-26 14:50:03 +0000
 +++ tests/unit_x11/tst_bottomedge/AutoCollapseInPageHeader.qml	2016-03-01 10:46:21 +0000
@@ -23,7 +23,9 @@
      height: units.gu(71)
      Page {
--        title: "Main page"
++        header: PageHeader {
++            title: "Main page"
++        }
          BottomEdge {
              id: bottomEdge
 === modified file 'tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml'
 --- tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml	2015-11-26 14:50:03 +0000
 +++ tests/unit_x11/tst_bottomedge/AutoCollapseInPageWithPageHeader.qml	2016-03-01 10:46:21 +0000
@@ -23,7 +23,9 @@
      height: units.gu(71)
      Page {
--        title: "Main page"
++        header: PageHeader {
++            title: "Main page"
++        }
          BottomEdge {
              id: bottomEdge
 === added file 'tests/unit_x11/tst_bottomedge/PreloadedContent.qml'
 --- tests/unit_x11/tst_bottomedge/PreloadedContent.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_bottomedge/PreloadedContent.qml	2016-03-01 10:46:21 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++Item {
++    id: holder
++    width: units.gu(40)
++    height: units.gu(71)
++
++    BottomEdge {
++        id: bottomEdge
++        height: parent.height
++        hint.text: "Test"
++        objectName: "testItem"
++        preloadContent: true
++        contentComponent: Rectangle {
++            objectName: "default"
++            width: bottomEdge.width
++            height: bottomEdge.height
++            color: UbuntuColors.silk
++        }
++
++        BottomEdgeRegion {
++            from: 0.2
++            to: 0.5
++            contentComponent: Rectangle {
++                objectName: "region1"
++                width: bottomEdge.width - units.gu(10)
++                height: bottomEdge.height
++                color: UbuntuColors.red
++            }
++        }
++        BottomEdgeRegion {
++            from: 0.5
++            to: 0.7
++            contentComponent: Rectangle {
++                objectName: "region2"
++                width: bottomEdge.width - units.gu(15)
++                height: bottomEdge.height
++                color: UbuntuColors.blue
++            }
++        }
++    }
++}
 === modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp'
 --- tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2016-02-10 10:57:20 +0000
 +++ tests/unit_x11/tst_bottomedge/tst_bottomedge.cpp	2016-03-01 10:46:21 +0000
@@ -114,6 +114,7 @@
  class tst_BottomEdge : public QObject
+ {
      Q_OBJECT
++    QStringList regionObjects;
  private Q_SLOTS:
      void initTestCase()
@@ -121,6 +122,12 @@
          UCTestExtras::registerTouchDevice();
+     }
++    void init()
++    {
++        regionObjects.clear();
++    }
++
++private Q_SLOTS:
      void test_defaults()
+     {
          QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("Defaults.qml"));
@@ -137,6 +144,7 @@
          QCOMPARE(test->regionAt("testItem", 0)->m_from, 0.33);
          QCOMPARE(test->regionAt("testItem", 0)->m_to, 1.0);
          QVERIFY(!test->testItem()->activeRegion());
++        QVERIFY(!test->testItem()->preloadContent());
+     }
      void test_height_moves_when_reparented()
@@ -880,6 +888,74 @@
          bottomEdge->setEnabled(!bottomEdge->isEnabled());
          QCOMPARE(bottomEdge->isEnabled(), bottomEdge->hint()->isEnabled());
+     }
++
++    void test_preload_content()
++    {
++        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadedContent.qml"));
++        UCBottomEdge *bottomEdge = test->testItem();
++
++        QPoint from(bottomEdge->width() / 2.0f, bottomEdge->height() - 5);
++        QPoint to = from + QPoint(0, -(bottomEdge->parentItem()->height() - 1));
++        QSignalSpy spy(bottomEdge, SIGNAL(activeRegionChanged(UCBottomEdgeRegion*)));
++
++        connect(bottomEdge, &UCBottomEdge::contentItemChanged, [=]() {
++            regionObjects.append(bottomEdge->contentItem()
++                                    ? bottomEdge->contentItem()->objectName()
++                                    : "NULL");
++        });
++
++        UCTestExtras::touchPress(0, bottomEdge, from);
++        QPoint movePos(from);
++        while (movePos.y() > to.y()) {
++            QTest::qWait(20);
++            UCTestExtras::touchMove(0, bottomEdge, movePos);
++            movePos += QPoint(0, -10);
++        }
++        QTest::qWait(20);
++        UCTestExtras::touchRelease(0, bottomEdge, movePos);
++        // we should have had 3 active region changes by now
++        // null -> region #0 -> region #1 -> null
++        QCOMPARE(spy.count(), 3);
++        QCOMPARE(regionObjects.size(), 5);
++        int i = 0;
++        QCOMPARE(regionObjects[i++], QString("default"));
++        QCOMPARE(regionObjects[i++], QString("region1"));
++        QCOMPARE(regionObjects[i++], QString("default"));
++        QCOMPARE(regionObjects[i++], QString("region2"));
++        QCOMPARE(regionObjects[i++], QString("default"));
++    }
++
++    void test_reset_preload_content()
++    {
++        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadedContent.qml"));
++        UCBottomEdge *bottomEdge = test->testItem();
++
++        UCBottomEdgePrivate *d = UCBottomEdgePrivate::get(bottomEdge);
++        for (int i = 0; i < d->regions.size(); i++) {
++            QVERIFY(d->regions[i]->regionContent());
++        }
++
++        // set preloadContent: false
++        bottomEdge->setPreloadContent(false);
++        for (int i = 0; i < d->regions.size(); i++) {
++            QVERIFY(!d->regions[i]->regionContent());
++        }
++    }
++
++    void test_disabled_content_unloads()
++    {
++        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadedContent.qml"));
++        UCBottomEdge *bottomEdge = test->testItem();
++
++        UCBottomEdgePrivate *d = UCBottomEdgePrivate::get(bottomEdge);
++        // disable a region
++        d->regions[0]->setEnabled(false);
++        QVERIFY(!d->regions[0]->regionContent());
++
++        // enable it
++        d->regions[0]->setEnabled(true);
++        QTRY_VERIFY_WITH_TIMEOUT(d->regions[0]->regionContent() != nullptr, 1000);
++    }
  };
  QTEST_MAIN(tst_BottomEdge)
 === modified file 'tests/unit_x11/tst_bottomedge/tst_bottomedge.pro'
 --- tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2015-12-17 15:23:26 +0000
 +++ tests/unit_x11/tst_bottomedge/tst_bottomedge.pro	2016-03-01 10:46:21 +0000
@@ -1,5 +1,5 @@
  include(../test-include.pri)
--QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private
++QT += core-private qml-private quick-private gui-private UbuntuGestures UbuntuGestures_private UbuntuToolkit
  SOURCES += \
      tst_bottomedge.cpp
@@ -22,4 +22,5 @@
      AutoCollapseInPageWithPageHeader.qml \
      LeanActiveRegionChange.qml \
      UncoveredByRegion.qml \
--    OverriddenHintTrigger.qml
++    OverriddenHintTrigger.qml \
++    PreloadedContent.qml

Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/bottomEdgePreloadsContent into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers