From 21c15927cfb3ddb11bdec250ec5532addcae6453 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Mon, 27 Feb 2017 19:33:52 +0000 Subject: [PATCH] Homebutton dimension and position scales with tablet --- scripts/system/libraries/WebTablet.js | 6 +++--- scripts/system/tablet-ui/tabletUI.js | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index 367ef05aea..d8ffbcf480 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -151,12 +151,12 @@ WebTablet = function (url, width, dpi, hand, clientOnly) { isAA: HMD.active }); - var HOME_BUTTON_Y_OFFSET = (this.height / 2) - 0.035; + var HOME_BUTTON_Y_OFFSET = (this.height / 2) - 0.009; this.homeButtonEntity = Overlays.addOverlay("sphere", { name: "homeButton", - localPosition: {x: 0.0, y: -HOME_BUTTON_Y_OFFSET, z: -0.01}, + localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0}, localRotation: Quat.angleAxis(0, Y_AXIS), - dimensions: { x: 0.04, y: 0.04, z: 0.02}, + dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor}, alpha: 0.0, visible: true, drawInFront: false, diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js index 632cb40bb5..8aee7bcbf6 100644 --- a/scripts/system/tablet-ui/tabletUI.js +++ b/scripts/system/tablet-ui/tabletUI.js @@ -26,9 +26,15 @@ print("show tablet-ui"); var DEFAULT_WIDTH = 0.4375; - var DEFAULT_HMD_TABLET_SCALE = 100; - var HMD_TABLET_SCALE = Settings.getValue("hmdTabletScale") || DEFAULT_HMD_TABLET_SCALE; - UIWebTablet = new WebTablet("qml/hifi/tablet/TabletRoot.qml", DEFAULT_WIDTH * (HMD_TABLET_SCALE / 100), null, activeHand, true); + var DEFAULT_TABLET_SCALE = 100; + var toolbarMode = Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode; + var TABLET_SCALE = DEFAULT_TABLET_SCALE; + if (toolbarMode) { + TABLET_SCALE = Settings.getValue("desktopTabletScale") || DEFAULT_TABLET_SCALE; + } else { + TABLET_SCALE = Settings.getValue("hmdTabletScale") || DEFAULT_TABLET_SCALE; + } + UIWebTablet = new WebTablet("qml/hifi/tablet/TabletRoot.qml", DEFAULT_WIDTH * (TABLET_SCALE / 100), null, activeHand, true); UIWebTablet.register(); HMD.tabletID = UIWebTablet.tabletEntityID; HMD.homeButtonID = UIWebTablet.homeButtonEntity;