git.iko.soy/unity8
on xenial help sign in
Merge
commita735eee8174d80b3a92d2665ec2d091e67a50ae1 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 19 Aug 2015, 09:07 (11 years ago) parentec468072ef5ca5
5 files changed+65−38
compare with xenial
unifiedsplit
debian/changelog+12 debian/rules−5 qml/Dash/GenericScopeView.qml+21−15 qml/Dash/PreviewListView.qml+16−6 tests/qmltests/Dash/tst_PageHeader.qml+16−12
debian/changelog+12
@@ -1,3 +1,15 @@
1+unity8 (8.11+15.04.20150817-0ubuntu1) vivid; urgency=medium
2+
3+ [ Albert Astals Cid ]
4+ * Drop gcc 4.9 requirement in debian/rules
5+ * Make the test more stable
6+ * Optimize scope.preview() calls (LP: #1478022)
7+
8+ [ Alberto Mardegan ]
9+ * Set currentIndex after the model change is completed (LP: #1433442)
10+
11+ -- CI Train Bot <ci-train-bot@canonical.com> Mon, 17 Aug 2015 11:57:31 +0000
12+
113unity8 (8.11+15.04.20150814-0ubuntu1) vivid; urgency=medium
214
315 [ Albert Astals Cid ]
debian/rules−5
@@ -8,11 +8,6 @@ include /usr/share/dpkg/default.mk
88export DPKG_GENSYMBOLS_CHECK_LEVEL=4
99export NO_PNG_PKG_MANGLE=1
1010
11−# Explicitly selecting a G{CC,++}-version here to avoid accidental
12−# ABI breaks introduced by toolchain updates.
13−export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
14−export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
15−
1611%:
1712 dh $@ --parallel --fail-missing --with python3
1813
qml/Dash/GenericScopeView.qml+21−15
@@ -99,23 +99,25 @@ FocusScope {
9999 function itemPressedAndHeld(index, result, resultsModel, limitedCategoryItemCount, categoryId) {
100100 clearMaybePreviewData();
101101
102− if (scope.preview(result, categoryId)) {
103− openPreview(index, resultsModel, limitedCategoryItemCount, categoryId);
104− }
102+ openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId);
105103 }
106104
107− function openPreview(index, resultsModel, limitedCategoryItemCount, categoryId) {
108− if (limitedCategoryItemCount > 0) {
109− previewLimitModel.model = resultsModel;
110− previewLimitModel.limit = limitedCategoryItemCount;
111− subPageLoader.model = previewLimitModel;
112− } else {
113− subPageLoader.model = resultsModel;
105+ function openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId) {
106+ var previewStack = scope.preview(result, categoryId);
107+ if (previewStack) {
108+ if (limitedCategoryItemCount > 0) {
109+ previewLimitModel.model = resultsModel;
110+ previewLimitModel.limit = limitedCategoryItemCount;
111+ subPageLoader.model = previewLimitModel;
112+ } else {
113+ subPageLoader.model = resultsModel;
114+ }
115+ subPageLoader.initialIndex = -1;
116+ subPageLoader.initialIndex = index;
117+ subPageLoader.categoryId = categoryId;
118+ subPageLoader.previewStack = previewStack;
119+ subPageLoader.openSubPage("preview");
114120 }
115− subPageLoader.initialIndex = -1;
116− subPageLoader.initialIndex = index;
117− subPageLoader.categoryId = categoryId;
118− subPageLoader.openSubPage("preview");
119121 }
120122
121123 Binding {
@@ -163,7 +165,8 @@ FocusScope {
163165 onHideDash: subPageLoader.closeSubPage()
164166 onPreviewRequested: { // (QVariant const& result)
165167 if (result === scopeView.maybePreviewResult) {
166− openPreview(scopeView.maybePreviewIndex,
168+ openPreview(result,
169+ scopeView.maybePreviewIndex,
167170 scopeView.maybePreviewResultsModel,
168171 scopeView.maybePreviewLimitedCategoryItemCount,
169172 scopeView.maybePreviewCategoryId);
@@ -758,6 +761,7 @@ FocusScope {
758761 property var scope: scopeView.scope
759762 property var scopeStyle: scopeView.scopeStyle
760763 property int initialIndex: -1
764+ property var previewStack;
761765 property string categoryId
762766 property var model: null
763767
@@ -791,6 +795,8 @@ FocusScope {
791795 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )
792796 item.model = Qt.binding(function() { return subPageLoader.model; } )
793797 item.categoryId = Qt.binding(function() { return subPageLoader.categoryId; } )
798+ item.initialIndexPreviewStack = subPageLoader.previewStack;
799+ subPageLoader.previewStack = null;
794800 }
795801 open = true;
796802 }
qml/Dash/PreviewListView.qml+16−6
@@ -24,9 +24,11 @@ Item {
2424 id: root
2525
2626 property int initialIndex: -1
27+ property var initialIndexPreviewStack: null
2728 property var scope: null
2829 property var scopeStyle: null
2930 property string categoryId
31+ property bool usedInitialIndex: false
3032
3133 property alias showSignatureLine: header.showSignatureLine
3234
@@ -84,10 +86,10 @@ Item {
8486 }
8587 }
8688
87− onCountChanged: {
88− if (count > 0 && initialIndex >= 0) {
89− currentIndex = initialIndex;
90− initialIndex = -1;
89+ onModelChanged: {
90+ if (count > 0 && initialIndex >= 0 && !usedInitialIndex) {
91+ usedInitialIndex = true;
92+ previewListView.positionViewAtIndex(initialIndex, ListView.SnapPosition);
9193 }
9294 }
9395
@@ -100,8 +102,16 @@ Item {
100102 isCurrent: ListView.isCurrentItem
101103
102104 previewModel: {
103− var previewStack = root.scope.preview(result, root.categoryId);
104− return previewStack.getPreviewModel(0);
105+ if (root.open) {
106+ if (index === root.initialIndex) {
107+ return root.initialIndexPreviewStack.getPreviewModel(0);
108+ } else {
109+ var previewStack = root.scope.preview(result, root.categoryId);
110+ return previewStack.getPreviewModel(0);
111+ }
112+ } else {
113+ return null;
114+ }
105115 }
106116 scopeStyle: root.scopeStyle
107117 }
tests/qmltests/Dash/tst_PageHeader.qml+16−12
@@ -33,13 +33,18 @@ Item {
3333
3434 property alias searchEnabled : pageHeader.searchEntryEnabled
3535 property alias searchQuery : pageHeader.searchQuery
36+ property var headerContainer: findChild(pageHeader, "headerContainer")
3637
3738 function doTypeString(text) {
38− var headerContainer = findChild(pageHeader, "headerContainer");
3939 tryCompare(headerContainer, "contentY", 0);
4040 typeString(text);
4141 }
4242
43+ function doResetSearch() {
44+ pageHeader.resetSearch();
45+ tryCompare(headerContainer, "contentY", headerContainer.height);
46+ }
47+
4348 function init() {
4449 searchEnabled = true;
4550
@@ -49,14 +54,13 @@ Item {
4954 pageHeader.searchHistory.clear();
5055
5156 // Check initial state
52− var headerContainer = findChild(pageHeader, "headerContainer");
5357 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
5458 compare(pageHeader.searchHistory.count, 0);
5559 }
5660
5761 function test_search_disabled() {
5862 searchEnabled = false
59− pageHeader.resetSearch()
63+ doResetSearch();
6064
6165 pageHeader.triggerSearch()
6266 keyClick(Qt.Key_S)
@@ -66,7 +70,7 @@ Item {
6670
6771 function test_search_enable() {
6872 searchEnabled = true
69− pageHeader.resetSearch()
73+ doResetSearch();
7074
7175 pageHeader.triggerSearch()
7276 doTypeString("test")
@@ -84,42 +88,42 @@ Item {
8488
8589 function test_reset_search() {
8690 searchEnabled = true
87− pageHeader.resetSearch()
91+ doResetSearch();
8892
8993 pageHeader.triggerSearch()
9094 keyClick(Qt.Key_S)
9195
9296 compare(searchQuery, "s", "Could not type in TextField.")
9397
94− pageHeader.resetSearch()
98+ doResetSearch();
9599 compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
96100 }
97101
98102 function test_history() {
99103 pageHeader.triggerSearch()
100104 doTypeString("humppa1")
101− pageHeader.resetSearch()
105+ doResetSearch();
102106
103107 tryCompare(pageHeader.searchHistory, "count", 1)
104108 compare(pageHeader.searchHistory.get(0).query, "humppa1")
105109
106110 pageHeader.triggerSearch()
107111 doTypeString("humppa2")
108− pageHeader.resetSearch()
112+ doResetSearch();
109113
110114 compare(pageHeader.searchHistory.count, 2)
111115 compare(pageHeader.searchHistory.get(0).query, "humppa2")
112116
113117 pageHeader.triggerSearch()
114118 doTypeString("humppa3")
115− pageHeader.resetSearch()
119+ doResetSearch();
116120
117121 compare(pageHeader.searchHistory.count, 3)
118122 compare(pageHeader.searchHistory.get(0).query, "humppa3")
119123
120124 pageHeader.triggerSearch()
121125 doTypeString("humppa4")
122− pageHeader.resetSearch()
126+ doResetSearch();
123127
124128 compare(pageHeader.searchHistory.count, 3)
125129 compare(pageHeader.searchHistory.get(0).query, "humppa4")
@@ -139,7 +143,7 @@ Item {
139143 }
140144
141145 function cleanup() {
142− pageHeader.resetSearch();
146+ doResetSearch();
143147 }
144148
145149 function test_popover() {
@@ -223,7 +227,7 @@ Item {
223227 tryCompare(headerContainer, "showSearch", !data.hideSearch);
224228 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
225229
226− pageHeader.resetSearch();
230+ doResetSearch();
227231 }
228232
229233 function test_search_change_shows_search() {