git.iko.soy/unity8
on xenial help sign in
Don't clear if we're on the root
558fc05Albert Astals Cid
qml/Dash/DashNavigation.qml+6
compare with xenial
unifiedsplit
@@ -37,6 +37,12 @@ Item {
37 visible: height != 0
37 visible: height != 0
38 implicitHeight: navigationListView.y + navigationListView.height
38 implicitHeight: navigationListView.y + navigationListView.height
39
39
40+ function resetNavigation() {
41+ if (navigationModel.count > 1) {
42+ clear();
43+ }
44+ }
45+
40 QtObject {
46 QtObject {
41 id: d
47 id: d
42 readonly property color foregroundColor: root.scopeStyle
48 readonly property color foregroundColor: root.scopeStyle
qml/Dash/PageHeaderExtraPanel.qml+1−1
@@ -38,7 +38,7 @@ Item {
38 signal dashNavigationLeafClicked()
38 signal dashNavigationLeafClicked()
39
39
40 function resetNavigation() {
40 function resetNavigation() {
41− dashNavigation.clear();
41+ dashNavigation.resetNavigation();
42 }
42 }
43
43
44 Rectangle {
44 Rectangle {