git.iko.soy/unity8
on xenial help sign in
Use allLabel instead of label for the header (if available)
commit51107964a9cb66c9de26abcffa03745a8d7214ce authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 29 Sep 2015, 12:14 (11 years ago) parentce4cd28
2 files changed+2−2
compare with xenial
unifiedsplit
qml/Dash/DashNavigation.qml+1−1 qml/Dash/DashNavigationList.qml+1−1
qml/Dash/DashNavigation.qml+1−1
@@ -205,7 +205,7 @@ Item {
205205 } else {
206206 navigationModel.append({"navigationId": currentNavigation.parentNavigationId, "nullifyNavigation": false});
207207 }
208− headersModel.append({"headerText": currentNavigation.label,
208+ headersModel.append({"headerText": currentNavigation.allLabel != "" ? currentNavigation.allLabel : currentNavigation.label,
209209 "navigationId": currentNavigation.navigationId,
210210 "parentNavigationId": currentNavigation.parentNavigationId
211211 });
qml/Dash/DashNavigationList.qml+1−1
@@ -65,7 +65,7 @@ Item {
6565 anchors.leftMargin: itemsIndent
6666 anchors.right: parent.right
6767
68− onClicked: root.enterNavigation(navigationId, label, hasChildren)
68+ onClicked: root.enterNavigation(navigationId, allLabel != "" ? allLabel : label, hasChildren)
6969
7070 Label {
7171 anchors {