Merge lp:~aacid/unity8/new-scopes-image-gallery-scroll-workaround into lp:~unity-team/unity8/new-scopes

Proposed by Albert Astals Cid
Status: Merged
Merged at revision: 652
Proposed branch: lp:~aacid/unity8/new-scopes-image-gallery-scroll-workaround
Merge into: lp:~unity-team/unity8/new-scopes
Diff against target: 19 lines (+9/-0)
1 file modified
qml/Dash/Previews/PreviewImageGallery.qml (+9/-0)
To merge this branch: bzr merge lp:~aacid/unity8/new-scopes-image-gallery-scroll-workaround
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+207118@code.launchpad.net

Commit message

Add back the workaround for not being able scroll the image gallery

Taken from AppPreview.qml

Fixes bug #1281709

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
--- qml/Dash/Previews/PreviewImageGallery.qml 2014-02-05 12:08:18 +0000
+++ qml/Dash/Previews/PreviewImageGallery.qml 2014-02-19 09:14:14 +0000
@@ -33,6 +33,15 @@
33 cacheBuffer: width * 333 cacheBuffer: width * 3
34 model: root.widgetData["sources"]34 model: root.widgetData["sources"]
3535
36 // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)
37 // we finally reached the point where this ListView doesn't correctly get swipe input any more but
38 // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking
39 // layer to make sure this ListView can be swiped, regardless of what's behind it.
40 MouseArea {
41 anchors.fill: parent
42 enabled: parent.contentWidth > parent.width
43 }
44
36 LazyImage {45 LazyImage {
37 objectName: "placeholderScreenshot"46 objectName: "placeholderScreenshot"
38 anchors {47 anchors {

Subscribers

People subscribed via source and target branches

to all changes: