Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 16:03:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9435 from druiz17/tabletNav

Browse source 
Tablet issues Fixed
This commit is contained in:
Seth Alves 2017-01-19 09:22:18 -08:00 committed by GitHub
commit 1a6ae01d9c
6 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/tablet/TabletMouseHandler.qml
View file

@ -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;
}
}

4
interface/src/scripting/MenuScriptingInterface.cpp
View file

@ -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));
}

2
interface/src/scripting/MenuScriptingInterface.h
View file

@ -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.

5
libraries/ui/src/ui/Menu.cpp
View file

@ -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) {

2
libraries/ui/src/ui/Menu.h
View file

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

14
scripts/system/help.js
View file

@ -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);