@@ -21,14 +21,14 @@ import "../Components/ListItems" as ListItems
2121
2222ScopeView {
2323 id: scopeView
24− readonly property alias previewShown: previewLoader.onScreen
24+ readonly property alias previewShown: previewListView.onScreen
2525 property bool enableHeightBehaviorOnNextCreation: false
2626
2727 moving: categoryView.moving
2828
2929 onIsCurrentChanged: {
3030 pageHeader.resetSearch();
31− previewLoader.open = false;
31+ previewListView.open = false;
3232 }
3333
3434 onMovementStarted: categoryView.showHeader()
@@ -57,9 +57,8 @@ ScopeView {
5757
5858 Connections {
5959 target: scopeView.scope
60− onShowDash: previewLoader.open = false;
61− onHideDash: previewLoader.open = false;
62− onActivated: previewLoader.closePreviewSpinner();
60+ onShowDash: previewListView.open = false;
61+ onHideDash: previewListView.open = false;
6362 }
6463
6564 ScopeListView {
@@ -67,12 +66,18 @@ ScopeView {
6766 objectName: "categoryListView"
6867 anchors.fill: parent
6968 model: scopeView.categories
70− forceNoClip: previewLoader.onScreen
69+ forceNoClip: previewListView.onScreen
7170
7271 onAtYEndChanged: if (atYEnd) endReached()
7372 onMovingChanged: if (moving && atYEnd) endReached()
7473
7574 property string expandedCategoryId: ""
75+ signal correctExpandedCategory();
76+
77+ Behavior on contentY {
78+ enabled: previewListView.open
79+ UbuntuNumberAnimation {}
80+ }
7681
7782 delegate: ListItems.Base {
7883 id: baseItem
@@ -124,33 +129,50 @@ ScopeView {
124129 Connections {
125130 target: rendererLoader.item
126131 onClicked: {
132+ // Prepare the preview in case activate() triggers a preview only
127133 effect.positionPx = mapToItem(categoryView, 0, itemY).y
128− scopeView.scope.activate(delegateItem.model.uri,
129− delegateItem.model.icon,
130− delegateItem.model.category,
131− 0,
132− delegateItem.model.mimetype,
133− delegateItem.model.title,
134− delegateItem.model.comment,
135− delegateItem.model.dndUri,
136− delegateItem.model.metadata)
134+ previewListView.categoryId = categoryId
135+ previewListView.categoryDelegate = rendererLoader.item
136+ previewListView.model = model;
137+ previewListView.init = true;
138+ previewListView.currentIndex = index;
139+
140+ var item = model.get(index);
141+
142+ if ((scopeView.scope.id == "applications.scope" && categoryId == "installed")
143+ || (scopeView.scope.id == "home.scope" && categoryId == "applications.scope")) {
144+ scopeView.scope.activate(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
145+ item.comment, item.dndUri, item.metadata)
146+ } else {
147+ previewListView.open = true
148+
149+ scopeView.scope.preview( item.uri, item.icon, item.category, 0, item.mimetype, item.title,
150+ item.comment, item.dndUri, item.metadata)
151+ }
137152 }
138153 onPressAndHold: {
139154 effect.positionPx = mapToItem(categoryView, 0, itemY).y
140− scopeView.scope.preview( delegateItem.model.uri,
141− delegateItem.model.icon,
142− delegateItem.model.category,
143− 0,
144− delegateItem.model.mimetype,
145− delegateItem.model.title,
146− delegateItem.model.comment,
147− delegateItem.model.dndUri,
148− delegateItem.model.metadata)
155+ previewListView.categoryId = categoryId
156+ previewListView.categoryDelegate = rendererLoader.item
157+ previewListView.model = model;
158+ previewListView.init = true;
159+ previewListView.currentIndex = index;
160+ previewListView.open = true
161+
162+ var item = model.get(index)
163+ scopeView.scope.preview( item.uri, item.icon, item.category, 0, item.mimetype, item.title,
164+ item.comment, item.dndUri, item.metadata)
149165 }
150166 }
151167 Connections {
152168 target: categoryView
153169 onExpandedCategoryIdChanged: {
170+ collapseAllButExpandedCategory();
171+ }
172+ onCorrectExpandedCategory: {
173+ collapseAllButExpandedCategory();
174+ }
175+ function collapseAllButExpandedCategory() {
154176 var item = rendererLoader.item;
155177 if (item.expandable) {
156178 var shouldFilter = categoryId != categoryView.expandedCategoryId;
@@ -158,13 +180,15 @@ ScopeView {
158180 // If the filter animation will be seen start it, otherwise, just flip the switch
159181 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;
160182 var growingVisible = !shouldFilter && y + height < categoryView.height;
161− if (shrinkingVisible || growingVisible) {
162− item.startFilterAnimation(shouldFilter)
163− } else {
164− item.filter = shouldFilter;
165− }
166− if (!shouldFilter) {
167− categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);
183+ if (!previewListView.open || !shouldFilter) {
184+ if (shrinkingVisible || growingVisible) {
185+ item.startFilterAnimation(shouldFilter)
186+ } else {
187+ item.filter = shouldFilter;
188+ }
189+ if (!shouldFilter && !previewListView.open) {
190+ categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);
191+ }
168192 }
169193 }
170194 }
@@ -270,6 +294,7 @@ ScopeView {
270294
271295 OpenEffect {
272296 id: effect
297+ objectName: "openEffect"
273298 anchors {
274299 fill: parent
275300 bottomMargin: -bottomOverflow
@@ -282,29 +307,44 @@ ScopeView {
282307 topOpacity: (1 - gap * 1.2)
283308 bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
284309 bottomOverflow: units.gu(20)
285− bottomOpacity: 1 - (gap * 0.8)
310+ live: !expansionAnimation.running
286311
287312 property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
288− property real gap: previewLoader.open ? 1.0 : 0.0
313+ property real gap: previewListView.open ? 1.0 : 0.0
289314
290315 Behavior on gap {
291316 NumberAnimation {
317+ id: expansionAnimation
292318 duration: 200
293319 easing.type: Easing.InOutQuad
294320 onRunningChanged: {
295− if (!previewLoader.open && !running) {
296− previewLoader.onScreen = false
321+ if (!previewListView.open && !running) {
322+ previewListView.onScreen = false
297323 }
298324 }
299325 }
300326 }
327+ Behavior on positionPx {
328+ enabled: previewListView.open
329+ UbuntuNumberAnimation {}
330+ }
301331 }
302332
303333 Connections {
304334 target: scopeView.scope
305335 onPreviewReady: {
306− previewLoader.previewData = preview
307− previewLoader.open = true
336+ if (previewListView.init) {
337+ // Preview was triggered because of a click on the item. Need to expand now.
338+ if (!previewListView.open) {
339+ previewListView.open = true
340+ }
341+
342+ var index = previewListView.currentIndex
343+ previewListView.currentIndex = -1
344+ previewListView.currentIndex = index
345+ previewListView.init = false
346+ }
347+ previewListView.currentItem.previewData = preview
308348 }
309349 }
310350
@@ -312,18 +352,9 @@ ScopeView {
312352 id: previewDelegateMapper
313353 }
314354
315− Connections {
316− ignoreUnknownSignals: true
317− target: previewLoader.valid ? previewLoader.item : null
318− onClose: {
319− previewLoader.open = false
320− }
321− }
322−
323− Loader {
324− objectName: "previewLoader"
325− id: previewLoader
326− property var previewData
355+ ListView {
356+ id: previewListView
357+ objectName: "previewListView"
327358 height: effect.bottomGapPx - effect.topGapPx
328359 anchors {
329360 top: parent.top
@@ -331,38 +362,168 @@ ScopeView {
331362 left: parent.left
332363 right: parent.right
333364 }
334− source: onScreen ? previewDelegateMapper.map(previewLoader.previewData.rendererName) : ""
365+ orientation: ListView.Horizontal
366+ highlightRangeMode: ListView.StrictlyEnforceRange
367+ snapMode: ListView.SnapOneItem
368+ boundsBehavior: Flickable.DragAndOvershootBounds
369+ highlightMoveDuration: 250
370+ flickDeceleration: units.gu(625)
371+ maximumFlickVelocity: width * 5
372+ cacheBuffer: 0
373+
374+ // To be set before opening the preview
375+ property string categoryId: ""
376+ property var categoryDelegate
377+
378+ // because the ListView is built asynchronous, setting the
379+ // currentIndex directly won't work. We need to refresh it
380+ // when the first preview is ready to be displayed.
381+ property bool init: true
382+
383+ onCurrentIndexChanged: {
384+ var row = Math.floor(currentIndex / categoryDelegate.columns);
385+ if (categoryDelegate.collapsedRowCount <= row) {
386+ categoryView.expandedCategoryId = categoryId
387+ }
388+
389+ if (open) {
390+ categoryDelegate.highlightIndex = currentIndex
391+ }
392+
393+ if (!init && model !== undefined) {
394+ var item = model.get(currentIndex)
395+ scopeView.scope.preview( item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
396+ }
397+
398+ var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
399+ var newContentY = itemY - effect.positionPx - categoryDelegate.verticalSpacing;
400+ var effectAdjust = effect.positionPx;
401+ if (newContentY < 0) {
402+ effectAdjust += newContentY;
403+ newContentY = 0;
404+ }
405+ if (newContentY > Math.max(0, categoryView.contentHeight - categoryView.height)) {
406+ effectAdjust += -(categoryView.contentHeight - categoryView.height) + newContentY
407+ newContentY = categoryView.contentHeight - categoryView.height;
408+ }
409+
410+ effect.positionPx = effectAdjust;
411+ categoryView.contentY = newContentY - categoryView.originY;
412+ }
335413
336414 property bool open: false
337415 property bool onScreen: false
338− property bool valid: item !== null
339416
340417 onOpenChanged: {
341418 if (open) {
342− onScreen = true
419+ onScreen = true;
420+ categoryDelegate.highlightIndex = currentIndex;
421+ pageHeader.unfocus();
422+ } else {
423+ // Cancel any pending preview requests or actions
424+ if (previewListView.currentItem.previewData !== undefined) {
425+ previewListView.currentItem.previewData.cancelAction();
426+ }
427+ scopeView.scope.cancelActivation();
428+ model = undefined;
429+ categoryView.correctExpandedCategory();
430+ categoryDelegate.highlightIndex = -1;
343431 }
344432 }
345433
346− onLoaded: {
347− item.previewData = Qt.binding(function() { return previewLoader.previewData })
434+ Rectangle {
435+ anchors.fill: parent
436+ color: Qt.rgba(0, 0, 0, .3)
437+ z: -1
438+ }
439+
440+ delegate: Loader {
441+ id: previewLoader
442+ objectName: "previewLoader" + index
443+ height: previewListView.height
444+ width: previewListView.width
445+ asynchronous: true
446+ source: previewListView.onScreen ?
447+ (previewData !== undefined ? previewDelegateMapper.map(previewData.rendererName) : "DashPreviewPlaceholder.qml") : ""
448+
449+ onPreviewDataChanged: {
450+ if (previewData !== undefined && source.toString().indexOf("DashPreviewPlaceholder.qml") != -1) {
451+ previewLoader.opacity = 0;
452+ }
453+ }
454+
455+ onSourceChanged: {
456+ if (previewData !== undefined) {
457+ fadeIn.start()
458+ }
459+ }
460+
461+ PropertyAnimation {
462+ id: fadeIn
463+ target: previewLoader
464+ property: "opacity"
465+ from: 0.0
466+ to: 1.0
467+ duration: UbuntuAnimation.BriskDuration
468+ }
469+
470+ property var previewData
471+ property bool valid: item !== null
472+
473+ onLoaded: {
474+ if (previewListView.onScreen && previewData !== undefined) {
475+ item.previewData = Qt.binding(function() { return previewData })
476+ }
477+ }
478+
479+ Connections {
480+ ignoreUnknownSignals: true
481+ target: item
482+ onClose: {
483+ previewListView.open = false
484+ }
485+ }
486+
487+ function closePreviewSpinner() {
488+ if(item) {
489+ item.showProcessingAction = false;
490+ }
491+ }
348492 }
493+ }
494+
495+ Image {
496+ objectName: "pointerArrow"
497+ anchors {
498+ top: previewListView.bottom
499+ left: parent.left
500+ leftMargin: previewListView.categoryDelegate !== undefined && previewListView.categoryDelegate.currentItem ?
501+ previewListView.categoryDelegate.currentItem.center + (-width + margins) / 2 : 0
349502
350− function closePreviewSpinner() {
351− if(item) {
352− item.showProcessingAction = false;
503+ Behavior on leftMargin {
504+ SmoothedAnimation {
505+ duration: UbuntuAnimation.FastDuration
506+ }
353507 }
354508 }
509+ height: units.gu(1)
510+ width: units.gu(2)
511+ property int margins: previewListView.categoryDelegate ? previewListView.categoryDelegate.margins : 0
512+ opacity: previewListView.open ? .5 : 0
513+
514+ source: "graphics/tooltip_arrow.png"
355515 }
356516
357517 // TODO: Move as InverseMouseArea to DashPreview
358518 MouseArea {
359− enabled: previewLoader.onScreen
519+ objectName: "closePreviewMouseArea"
520+ enabled: previewListView.onScreen
360521 anchors {
361522 fill: parent
362523 topMargin: effect.bottomGapPx
363524 }
364525 onClicked: {
365− previewLoader.open = false;
526+ previewListView.open = false;
366527 }
367528 }
368529}