gallery-app

Merge lp:~phablet-team/gallery-app/gallery-app-desktop-scrollbars into lp:gallery-app

  1. gallery-app-desktop-scrollbars
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Needs review
Proposed branch: lp:~phablet-team/gallery-app/gallery-app-desktop-scrollbars
Merge into: lp:gallery-app
Diff against target: 42 lines (+13/-0)
3 files modified
rc/qml/Components/Checkerboard.qml (+4/-0)
rc/qml/Components/MediaGrid.qml (+5/-0)
rc/qml/OrganicView/OrganicView.qml (+4/-0)
To merge this branch: bzr merge lp:~phablet-team/gallery-app/gallery-app-desktop-scrollbars
Reviewer Review Type Date Requested Status
Arthur Mello (community) Needs Information
PS Jenkins bot continuous-integration Approve
Review via email: mp+222502@code.launchpad.net

Commit message

Add support for scrollbars on desktop.

Description of the change

Add support for scrollbars on desktop.

This will require this branch of the SDK to be merged and released: https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/interactiveThumb/+merge/218307 for the toolbars to appear when scrolling.

They will still not very visible and they will not display when hovered due to bugs in the SDK code.
When the SDK will be fixed we will not need any changes in the apps, though.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:992
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/859/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/104
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/834
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/834/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/859/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
Arthur Mello (artmello) wrote :

Looks good, but is this still necessary?

review: Needs Information
Reply

Unmerged revisions

992. By Ugo Riboni

Add scrollbars, for the desktop version

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rc/qml/Components/Checkerboard.qml'
2--- rc/qml/Components/Checkerboard.qml 2013-06-20 11:54:49 +0000
3+++ rc/qml/Components/Checkerboard.qml 2014-06-09 13:56:53 +0000
4@@ -229,6 +229,10 @@
5 duration: Gallery.FAST_DURATION
6 }
7 }
8+
9+ Scrollbar {
10+ flickableItem: grid
11+ }
12 }
13
14 NumberAnimation {
15
16=== modified file 'rc/qml/Components/MediaGrid.qml'
17--- rc/qml/Components/MediaGrid.qml 2014-04-30 09:31:55 +0000
18+++ rc/qml/Components/MediaGrid.qml 2014-06-09 13:56:53 +0000
19@@ -138,4 +138,9 @@
20 easing.type: Easing.InQuint
21 }
22 }
23+
24+ Scrollbar {
25+ flickableItem: photosGrid
26+ }
27+
28 }
29
30=== modified file 'rc/qml/OrganicView/OrganicView.qml'
31--- rc/qml/OrganicView/OrganicView.qml 2014-03-10 17:20:03 +0000
32+++ rc/qml/OrganicView/OrganicView.qml 2014-06-09 13:56:53 +0000
33@@ -92,5 +92,9 @@
34 }
35 // TODO: specify add and remove transitions here too. When I tried
36 // initially, QML ignored it.
37+
38+ Scrollbar {
39+ flickableItem: organicList
40+ }
41 }
42 }

Subscribers

People subscribed via source and target branches

to all changes: