diff --git a/interface/resources/qml/hifi/tablet/TabletMenuView.qml b/interface/resources/qml/hifi/tablet/TabletMenuView.qml index 33e5b3f34c..120ad78f2e 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml @@ -108,12 +108,7 @@ FocusScope { } currentIndex = originalIndex; } - - function previousItem() { currentIndex = (currentIndex + count - 1) % count; } - function nextItem() { currentIndex = (currentIndex + count + 1) % count; } - function selectCurrentItem() { if (currentIndex != -1) root.selected(currentItem.source); } - function previousPage() { root.parent.pop(); } - + Keys.onUpPressed: previousItem(); Keys.onDownPressed: nextItem(); Keys.onSpacePressed: selectCurrentItem(); @@ -121,6 +116,13 @@ FocusScope { Keys.onReturnPressed: selectCurrentItem(); Keys.onLeftPressed: previousPage(); } + + function previousItem() { listView.currentIndex = (listView.currentIndex + listView.count - 1) % listView.count; } + function nextItem() { listView.currentIndex = (listView.currentIndex + listView.count + 1) % listView.count; } + function selectCurrentItem() { if (listView.currentIndex != -1) root.selected(currentItem.source); } + function previousPage() { root.parent.pop(); } + + } diff --git a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml index 33cfb7a646..77c1ae0a39 100644 --- a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml +++ b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml @@ -171,4 +171,9 @@ Item { return false; } + function previousItem() { d.topMenu.previousItem(); } + function nextItem() { d.topMenu.nextItem(); } + function selectCurrentItem() { d.topMenu.selectCurrentItem(); } + function previousPage() { d.topMenu.previousPage(); } + } diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp index bb40dc33e2..c57389db2a 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.cpp +++ b/libraries/script-engine/src/TabletScriptingInterface.cpp @@ -347,7 +347,7 @@ QQuickItem* TabletProxy::getQmlMenu() const { return nullptr; } - QQuickItem* menuList = VrMenu->findChild("menuList"); + QQuickItem* menuList = VrMenu->findChild("tabletMenuHandlerItem"); if (!menuList) { return nullptr; }