Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847

Browse source 
MS16847: Tablet button doesn't load in HMD mode
This commit is contained in:
John Conklin II 2018-08-29 13:20:04 -07:00 committed by GitHub
commit 47ce8be526
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/ui/src/ui/TabletScriptingInterface.cpp
View file

@ -140,8 +140,7 @@ int TabletButtonsProxyModel::buttonIndex(const QString &uuid) {
return -1; return -1;
} }
void TabletButtonsProxyModel::setPageIndex(int pageIndex) void TabletButtonsProxyModel::setPageIndex(int pageIndex) {
{
if (_pageIndex == pageIndex) if (_pageIndex == pageIndex)
return; return;
@ -465,6 +464,9 @@ void TabletProxy::onTabletShown() {
_showRunningScripts = false; _showRunningScripts = false;
pushOntoStack("hifi/dialogs/TabletRunningScripts.qml"); pushOntoStack("hifi/dialogs/TabletRunningScripts.qml");
} }
if (_currentPathLoaded == TABLET_HOME_SOURCE_URL) {
loadHomeScreen(true);
}
} }
} }

2
scripts/system/tablet-ui/tabletUI.js
View file

@ -306,7 +306,7 @@
} }
wantsMenu = clicked; wantsMenu = clicked;
}); });
clickMapping.from(Controller.Standard.Start).peek().to(function (clicked) { clickMapping.from(Controller.Standard.Start).peek().to(function (clicked) {
if (clicked) { if (clicked) {
//activeHudPoint2dGamePad(); //activeHudPoint2dGamePad();