From b723f3d92e27e7db21ef2bcb5da587b2d33c80fe Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 5 Dec 2016 10:03:30 +1300
Subject: [PATCH] Fix Web tablet screen size

---
 scripts/system/libraries/WebTablet.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 6001bbf810..de18d389a7 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -11,7 +11,7 @@
 var RAD_TO_DEG = 180 / Math.PI;
 var X_AXIS = {x: 1, y: 0, z: 0};
 var Y_AXIS = {x: 0, y: 1, z: 0};
-var DEFAULT_DPI = 32;
+var DEFAULT_DPI = 30;
 var DEFAULT_WIDTH = 0.5;
 
 var TABLET_URL = "https://s3.amazonaws.com/hifi-public/tony/tablet.fbx";
@@ -43,7 +43,8 @@ WebTablet = function (url, width, dpi, clientOnly) {
 
     var ASPECT = 4.0 / 3.0;
     var WIDTH = width || DEFAULT_WIDTH;
-    var HEIGHT = WIDTH * ASPECT;
+    var TABLET_HEIGHT_SCALE = 640 / 680;  //  Screen size of tablet entity isn't quite the desired aspect.
+    var HEIGHT = WIDTH * ASPECT * TABLET_HEIGHT_SCALE;
     var DEPTH = 0.025;
     var DPI = dpi || DEFAULT_DPI;
 
@@ -62,10 +63,9 @@ WebTablet = function (url, width, dpi, clientOnly) {
         }),
         dimensions: {x: WIDTH, y: HEIGHT, z: DEPTH},
         parentID: MyAvatar.sessionUUID,
-        parentJointIndex: -2
+        parentJointIndex: -1
     }, clientOnly);
 
-    var WEB_OVERLAY_SCALE_FACTOR = { x: 2, y: 1.6 };
     var WEB_OVERLAY_Z_OFFSET = -0.01;
 
     var webOverlayRotation = Quat.multiply(spawnInfo.rotation, Quat.angleAxis(180, Y_AXIS));
@@ -73,10 +73,10 @@ WebTablet = function (url, width, dpi, clientOnly) {
 
     this.webOverlayID = Overlays.addOverlay("web3d", {
         url: url,
-        dimensions: { x: WIDTH * WEB_OVERLAY_SCALE_FACTOR.x, y: HEIGHT * WEB_OVERLAY_SCALE_FACTOR.y },
         position: webOverlayPosition,
         rotation: webOverlayRotation,
         resolution: { x: 480, y: 640 },
+        dpi: DPI,
         color: { red: 255, green: 255, blue: 255 },
         parentID: this.tabletEntityID,
         parentJointIndex: -1