Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 17:54:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1182 from ctrlaltdavid/fix/minitablet-goto

Browse source 
Fix minitablet goto
This commit is contained in:
Kalila 2021-04-19 15:38:50 -04:00 committed by GitHub
commit 77745b314b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -1011,7 +1011,7 @@ const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false; const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
const QString DEFAULT_CURSOR_NAME = "DEFAULT"; const QString DEFAULT_CURSOR_NAME = "DEFAULT";
const bool DEFAULT_MINI_TABLET_ENABLED = true; const bool DEFAULT_MINI_TABLET_ENABLED = false;
const bool DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED = true; const bool DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED = true;
QSharedPointer<OffscreenUi> getOffscreenUI() { QSharedPointer<OffscreenUi> getOffscreenUI() {

4
scripts/system/miniTablet.js
View file

@ -563,7 +563,7 @@
// Tablet targets. // Tablet targets.
isGoto = false, isGoto = false,
TABLET_ADDRESS_DIALOG = "hifi/tablet/TabletAddressDialog.qml", TABLET_EXPLORE_APP_UI = Script.resolvePath("../communityScripts/explore/explore.html"),
// Trigger values. // Trigger values.
leftTriggerOn = 0, leftTriggerOn = 0,
@ -907,7 +907,7 @@
var miniTabletProperties; var miniTabletProperties;
if (isGoto) { if (isGoto) {
tablet.loadQMLSource(TABLET_ADDRESS_DIALOG); tablet.gotoWebScreen(TABLET_EXPLORE_APP_UI);
} else { } else {
tablet.gotoHomeScreen(); tablet.gotoHomeScreen();
} }