From e5e9245b3c64a4d1f43ee9d3a8ffae30685b6d3b Mon Sep 17 00:00:00 2001
From: Ruslan Getmansky <ruslan.getmansky@gmail.com>
Date: Mon, 26 Jun 2017 17:42:21 +0300
Subject: [PATCH] P5-1491: Fix for canvas frame gets fat after switching to
 inches

---
 src/js/includes/FrameHandler.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/js/includes/FrameHandler.js b/src/js/includes/FrameHandler.js
index 91870ce..08c6c24 100644
--- a/src/js/includes/FrameHandler.js
+++ b/src/js/includes/FrameHandler.js
@@ -80,18 +80,24 @@ function FrameHandler(viewport) {
             o.set(config.frames[frameType]);
         });
 
+        var vpData = viewport.getData();
+        var frameSize = 29;
+        if (vpData.dim.units === 'inch') {
+            frameSize /= 2.54;
+        }
+
         _frames.top.height =
             _frames.bottom.height =
                 _frames.right.width =
-                    _frames.left.width = viewport.getData().ppmm * 29 * viewport.canvas.getImage().scaleX;
+                    _frames.left.width = vpData.ppmm * frameSize * viewport.canvas.getImage().scaleX;
 
-        _frames.top.width = _frames.bottom.width = viewport.getData().width;
-        _frames.right.height = _frames.left.height = viewport.getData().height;
+        _frames.top.width = _frames.bottom.width = vpData.width;
+        _frames.right.height = _frames.left.height = vpData.height;
 
         if (frameType === 'image') {
-            _frames.top.width -= (viewport.getData().ppmm * 29 * viewport.canvas.getImage().scaleX) * 2;
+            _frames.top.width -= (vpData.ppmm * frameSize * viewport.canvas.getImage().scaleX) * 2;
             _frames.bottom.width = _frames.top.width;
-            _frames.right.height -= (viewport.getData().ppmm * 29 * viewport.canvas.getImage().scaleX) * 2;
+            _frames.right.height -= (vpData.ppmm * frameSize * viewport.canvas.getImage().scaleX) * 2;
             _frames.left.height = _frames.right.height;
 
             _frames.top.set({