From 10a82ac11f6dffb9a75844d8eb0e9d38dbd827d7 Mon Sep 17 00:00:00 2001 From: Faye Li Si Fi Date: Thu, 12 Jan 2017 17:38:13 -0800 Subject: [PATCH] update breadcrumb text as you navigate menus --- interface/resources/qml/hifi/tablet/TabletMenu.qml | 2 +- .../resources/qml/hifi/tablet/TabletMouseHandler.qml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml index 7a3ec46364..6412e564ef 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenu.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml @@ -64,7 +64,7 @@ Item { RalewayBold { id: breadcrumbText - text: "MENU" + text: "Menu" size: 18 color: "#ffffff" anchors.verticalCenter: parent.verticalCenter diff --git a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml index db74de82fb..ab02f42a86 100644 --- a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml +++ b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml @@ -81,7 +81,14 @@ Item { if (menuStack.length) { topMenu = menuStack[menuStack.length - 1]; topMenu.focus = true; + // show current menu level on nav bar + if (topMenu.objectName === "") { + breadcrumbText.text = "Menu"; + } else { + breadcrumbText.text = topMenu.objectName; + } } else { + breadcrumbText.text = "Menu"; topMenu = null; //offscreenFlags.navigationFocused = false; menuRoot.enabled = false; @@ -133,6 +140,8 @@ Item { case MenuItemType.Menu: var target = Qt.vector2d(topMenu.x, topMenu.y).plus(Qt.vector2d(selectedItem.x + 96, selectedItem.y)); buildMenu(item.items, target).objectName = item.title; + // show current menu level on nav bar + breadcrumbText.text = item.title; break; case MenuItemType.Item: