From 965f9ab0a71e3eb78816d8b039c2b78f59c9c59f Mon Sep 17 00:00:00 2001 From: Faye Li Si Fi Date: Tue, 17 Jan 2017 11:58:48 -0800 Subject: [PATCH 1/2] fix tapping menu when already at the top-level menu blanks the tablet --- interface/resources/qml/hifi/tablet/TabletMenu.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml index 87daceea3b..2a057937cf 100644 --- a/interface/resources/qml/hifi/tablet/TabletMenu.qml +++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml @@ -78,8 +78,11 @@ Item { hoverEnabled: true onEntered: breadcrumbText.color = "#1fc6a6"; onExited: breadcrumbText.color = "#ffffff"; - // navigate back to parent level menu - onClicked: menuPopperUpper.closeLastMenu(); + // navigate back to parent level menu if there is one + onClicked: + if (breadcrumbText.text !== "Menu") { + menuPopperUpper.closeLastMenu(); + } } } } From 20ac96a7f9a60926534ee774ffc721cd163948ea Mon Sep 17 00:00:00 2001 From: Faye Li Si Fi Date: Tue, 17 Jan 2017 12:29:38 -0800 Subject: [PATCH 2/2] fix clicking on checkboxes in menus or on ghosted menu items slides in a blank page --- interface/resources/qml/hifi/tablet/TabletMouseHandler.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml index ab02f42a86..57d4c5837f 100644 --- a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml +++ b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml @@ -149,6 +149,8 @@ Item { // Don't block waiting for modal dialogs and such that the menu might open. delay.trigger(item); clearMenus(); + // build root level menu + tabletMenu.buildMenu(); break; } }