git.iko.soy/unity8
on xenial help sign in
More changes to review
commit446556a0d627ebb379a46a77b98e8a2d4ed6cb28 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateMon 25 Aug 2014, 17:56 (12 years ago) parentb57a1fa
3 files changed+14−11
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+9−4 qml/Dash/PreviewListView.qml+4−2 tests/qmltests/Dash/tst_GenericScopeView.qml+1−5
qml/Dash/GenericScopeView.qml+9−4
@@ -106,7 +106,7 @@ FocusScope {
106106
107107 onIsCurrentChanged: {
108108 if (pageHeaderLoader.item && showPageHeader) {
109− pageHeaderLoader.item.resetSearch();
109+ pageHeaderLoader.item.resetSearch();
110110 }
111111 subPageLoader.closeSubPage();
112112 }
@@ -439,6 +439,7 @@ FocusScope {
439439 }
440440
441441 onBackClicked: scopeView.backClicked()
442+
442443 onSettingsClicked: subPageLoader.openSubPage("settings")
443444 }
444445 }
@@ -473,13 +474,14 @@ FocusScope {
473474
474475 function openSubPage(page) {
475476 subPage = page;
477+ open = true;
476478 }
477479
478480 function closeSubPage() {
479481 open = false;
480482 }
481483
482− source: subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
484+ source: visible && subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
483485
484486 onLoaded: {
485487 if (status === Loader.Ready) {
@@ -490,13 +492,16 @@ FocusScope {
490492 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
491493 item.model = Qt.binding(function() { return subPageLoader.model } )
492494 }
493− open = true;
494495 }
495496 }
496497
497498 onOpenChanged: pageHeaderLoader.item.unfocus();
498499
499− onVisibleChanged: if (!visible) subPage = "";
500+ onVisibleChanged: {
501+ if (!visible) {
502+ subPage = "";
503+ }
504+ }
500505
501506 Connections {
502507 target: subPageLoader.item
qml/Dash/PreviewListView.qml+4−2
@@ -82,8 +82,10 @@ Item {
8282 }
8383
8484 onCountChanged: {
85− if (count > 0) currentIndex = initialIndex;
86− if (initialIndex >= 0) initialIndex = -1;
85+ if (count > 0) {
86+ currentIndex = initialIndex;
87+ if (initialIndex >= 0) initialIndex = -1;
88+ }
8789 }
8890
8991 delegate: Previews.Preview {
tests/qmltests/Dash/tst_GenericScopeView.qml+1−5
@@ -276,7 +276,6 @@ Item {
276276 mouseClick(tile, tile.width / 2, tile.height / 2);
277277 tryCompare(testCase.subPageLoader, "open", true);
278278 tryCompare(testCase.subPageLoader, "x", 0);
279− tryCompare(testCase.subPageLoader, "visible", true);
280279 }
281280
282281 function closePreview() {
@@ -284,12 +283,10 @@ Item {
284283 mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
285284
286285 tryCompare(testCase.subPageLoader, "open", false);
287− tryCompare(testCase.subPageLoader, "visible", false);
288286 }
289287
290288 function test_previewOpenClose() {
291289 tryCompare(testCase.subPageLoader, "open", false);
292− tryCompare(testCase.subPageLoader, "visible", false);
293290
294291 var categoryListView = findChild(genericScopeView, "categoryListView");
295292 categoryListView.positionAtBeginning();
@@ -374,12 +371,11 @@ Item {
374371
375372 // open
376373 tryCompare(testCase.subPageLoader, "open", false);
377− tryCompare(testCase.subPageLoader, "visible", false);
378374 var settings = findChild(innerHeader, "settings_header_button");
379375 mouseClick(settings, settings.width / 2, settings.height / 2);
380376 tryCompare(testCase.subPageLoader, "open", true);
381377 tryCompareFunction(function() { return ("" + subPageLoader.source).indexOf("ScopeSettingsPage.qml") != -1; }, true);
382− tryCompare(genericScopeView, "subPageShown", true);
378+ compare(genericScopeView.subPageShown, true);
383379 compare(testCase.subPageLoader.subPage, "settings");
384380 tryCompare(testCase.subPageLoader, "x", 0);
385381