git.iko.soy/unity8
on xenial help sign in
More changes requested
20f7e61Andrea Cimitan
qml/Dash/GenericScopeView.qml+4−9
compare with xenial
unifiedsplit
@@ -106,7 +106,7 @@ FocusScope {
106
106
107 onIsCurrentChanged: {
107 onIsCurrentChanged: {
108 if (pageHeaderLoader.item && showPageHeader) {
108 if (pageHeaderLoader.item && showPageHeader) {
109− pageHeaderLoader.item.resetSearch();
109+ pageHeaderLoader.item.resetSearch();
110 }
110 }
111 subPageLoader.closeSubPage();
111 subPageLoader.closeSubPage();
112 }
112 }
@@ -439,7 +439,6 @@ FocusScope {
439 }
439 }
440
440
441 onBackClicked: scopeView.backClicked()
441 onBackClicked: scopeView.backClicked()
442−
443 onSettingsClicked: subPageLoader.openSubPage("settings")
442 onSettingsClicked: subPageLoader.openSubPage("settings")
444 }
443 }
445 }
444 }
@@ -474,14 +473,13 @@ FocusScope {
474
473
475 function openSubPage(page) {
474 function openSubPage(page) {
476 subPage = page;
475 subPage = page;
477− open = true;
478 }
476 }
479
477
480 function closeSubPage() {
478 function closeSubPage() {
481 open = false;
479 open = false;
482 }
480 }
483
481
484− source: visible && subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
482+ source: subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
485
483
486 onLoaded: {
484 onLoaded: {
487 if (status === Loader.Ready) {
485 if (status === Loader.Ready) {
@@ -492,16 +490,13 @@ FocusScope {
492 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
490 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
493 item.model = Qt.binding(function() { return subPageLoader.model } )
491 item.model = Qt.binding(function() { return subPageLoader.model } )
494 }
492 }
493+ open = true;
495 }
494 }
496 }
495 }
497
496
498 onOpenChanged: pageHeaderLoader.item.unfocus();
497 onOpenChanged: pageHeaderLoader.item.unfocus();
499
498
500− onVisibleChanged: {
499+ onVisibleChanged: if (!visible) subPage = "";
501− if (!visible) {
502− subPage = "";
503− }
504− }
505
500
506 Connections {
501 Connections {
507 target: subPageLoader.item
502 target: subPageLoader.item
qml/Dash/PreviewListView.qml+1
@@ -83,6 +83,7 @@ Item {
83
83
84 onCountChanged: {
84 onCountChanged: {
85 if (count > 0) currentIndex = initialIndex;
85 if (count > 0) currentIndex = initialIndex;
86+ if (initialIndex >= 0) initialIndex = -1;
86 }
87 }
87
88
88 delegate: Previews.Preview {
89 delegate: Previews.Preview {