From a81a550e94aca0ed2d7e9b6bf20a721cffadd941 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 17 Apr 2021 16:55:16 +1200 Subject: [PATCH 1/2] Replace old Goto in mini tablet with Explore app --- scripts/system/miniTablet.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js index 1650cb60f4..c9942afd48 100644 --- a/scripts/system/miniTablet.js +++ b/scripts/system/miniTablet.js @@ -563,7 +563,7 @@ // Tablet targets. isGoto = false, - TABLET_ADDRESS_DIALOG = "hifi/tablet/TabletAddressDialog.qml", + TABLET_EXPLORE_APP_UI = Script.resolvePath("../communityScripts/explore/explore.html"), // Trigger values. leftTriggerOn = 0, @@ -907,7 +907,7 @@ var miniTabletProperties; if (isGoto) { - tablet.loadQMLSource(TABLET_ADDRESS_DIALOG); + tablet.gotoWebScreen(TABLET_EXPLORE_APP_UI); } else { tablet.gotoHomeScreen(); } From ab34c6ef967e0e36671ecd7951fe40da6f018ec0 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 17 Apr 2021 16:56:43 +1200 Subject: [PATCH 2/2] Default to mini tablet disabled --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 057f32f370..dad22f6b1f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1011,7 +1011,7 @@ const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false; const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; 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; QSharedPointer getOffscreenUI() {