Merge lp:~aacid/unity8/new-scopes-preview-fixes into lp:~unity-team/unity8/new-scopes

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Karnicki
Approved revision: 612
Merged at revision: 612
Proposed branch: lp:~aacid/unity8/new-scopes-preview-fixes
Merge into: lp:~unity-team/unity8/new-scopes
Diff against target: 35 lines (+2/-5)
2 files modified
qml/Dash/GenericScopeView.qml (+2/-0)
qml/Dash/PreviewListView.qml (+0/-5)
To merge this branch: bzr merge lp:~aacid/unity8/new-scopes-preview-fixes
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+205872@code.launchpad.net

Commit message

Preview fixes.

Don't need the activity indicator since preview is now immediate
Fix showing previews when not the first item

To post a comment you must log in.
612. By Albert Astals Cid

Merge++

Revision history for this message
Michał Karnicki (karni) wrote :

Good finding!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/GenericScopeView.qml'
2--- qml/Dash/GenericScopeView.qml 2014-02-07 16:28:49 +0000
3+++ qml/Dash/GenericScopeView.qml 2014-02-11 23:36:35 +0000
4@@ -193,6 +193,7 @@
5 previewListView.categoryId = categoryId
6 previewListView.categoryDelegate = rendererLoader.item
7 previewListView.model = target.model;
8+ previewListView.currentIndex = -1
9 previewListView.currentIndex = index;
10
11 var item = target.model.get(index);
12@@ -209,6 +210,7 @@
13 previewListView.categoryId = categoryId
14 previewListView.categoryDelegate = rendererLoader.item
15 previewListView.model = target.model;
16+ previewListView.currentIndex = -1
17 previewListView.currentIndex = index;
18 previewListView.open = true
19 }
20
21=== modified file 'qml/Dash/PreviewListView.qml'
22--- qml/Dash/PreviewListView.qml 2014-02-07 16:29:43 +0000
23+++ qml/Dash/PreviewListView.qml 2014-02-11 23:36:35 +0000
24@@ -173,11 +173,6 @@
25 to: 1.0
26 duration: UbuntuAnimation.BriskDuration
27 }
28-
29- ActivityIndicator {
30- anchors.centerIn: parent
31- running: visible
32- }
33 }
34 }
35 }

Subscribers

People subscribed via source and target branches

to all changes: