Merge pull request #9435 from druiz17/tabletNav

Tablet issues Fixed

interface/resources/qml/hifi/tablet/TabletMouseHandler.qml

@@ -148,9 +148,6 @@ Item {
                     console.log("Triggering " + item.text)
                     // 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;
                 }
         }

interface/src/scripting/MenuScriptingInterface.cpp

@@ -147,3 +147,7 @@ void MenuScriptingInterface::triggerOption(const QString& menuOption) {
     QMetaObject::invokeMethod(Menu::getInstance(), "triggerOption", Q_ARG(const QString&, menuOption));    
 }
 
+void MenuScriptingInterface::closeInfoView(const QString& path) {
+    QMetaObject::invokeMethod(Menu::getInstance(), "closeInfoView", Q_ARG(const QString&, path));
+}
+

interface/src/scripting/MenuScriptingInterface.h

@@ -182,6 +182,8 @@ public slots:
      */
     void setMenuEnabled(const QString& menuName, bool isEnabled);
 
+    void closeInfoView(const QString& path);
+
 signals:
     /**jsdoc
      * This is a signal that is emitted when a menu item is clicked.

libraries/ui/src/ui/Menu.cpp

@@ -256,6 +256,11 @@ bool Menu::isOptionChecked(const QString& menuOption) const {
     return false;
 }
 
+void Menu::closeInfoView(const QString& path) {
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    offscreenUi->hide(path);
+}
+
 void Menu::triggerOption(const QString& menuOption) {
     QAction* action = _actionHash.value(menuOption);
     if (action) {

libraries/ui/src/ui/Menu.h

@@ -114,6 +114,8 @@ public slots:
 
     void toggleDeveloperMenus();
     void toggleAdvancedMenus();
+
+    void closeInfoView(const QString& path);
     
     void triggerOption(const QString& menuOption);
 

scripts/system/help.js

@@ -19,7 +19,7 @@
         icon: "icons/tablet-icons/help-i.svg",
         text: "HELP"
     });
-
+    var enabled = false;
     function onClicked() {
         var HELP_URL = Script.resourcesPath() + "html/help.html";
 
@@ -38,7 +38,17 @@
             defaultTab = "gamepad";
         }
         var queryParameters = "handControllerName=" + handControllerName + "&defaultTab=" + defaultTab;
-        Menu.triggerOption('Help...');
+        print("Help enabled " + Menu.isMenuEnabled("Help..."))
+
+        if (enabled) {
+            Menu.closeInfoView('InfoView_html/help.html');
+            enabled = !enabled;
+            button.editProperties({isActive: enabled});
+        } else {
+            Menu.triggerOption('Help...');
+            enabled = !enabled;
+            button.editProperties({isActive: enabled});
+        }
     }
 
     button.clicked.connect(onClicked);