From 2efb2420e91302c87e32cd300ee679b99e4d1ba4 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 23 Jan 2019 15:50:19 +0100
Subject: [PATCH] Update offset with zoom

---
 src/commands/view/ShowOffset.js | 44 ++++++++++++++++++---------------
 src/editor/model/Editor.js      |  4 +++
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/commands/view/ShowOffset.js b/src/commands/view/ShowOffset.js
index 1965f90c9..7af11174f 100644
--- a/src/commands/view/ShowOffset.js
+++ b/src/commands/view/ShowOffset.js
@@ -11,6 +11,7 @@ module.exports = {
     var opt = opts || {};
     var state = opt.state || '';
     var config = editor.getConfig();
+    const zoom = this.em.getZoomDecimal();
 
     if (
       !config.showOffsets ||
@@ -78,9 +79,11 @@ module.exports = {
     }
 
     var unit = 'px';
-    var marginLeftSt = style.marginLeft.replace(unit, '');
-    var marginTopSt = parseInt(style.marginTop.replace(unit, ''));
-    var marginBottomSt = parseInt(style.marginBottom.replace(unit, ''));
+    var marginLeftSt = parseFloat(style.marginLeft.replace(unit, '')) * zoom;
+    var marginRightSt = parseFloat(style.marginRight.replace(unit, '')) * zoom;
+    var marginTopSt = parseFloat(style.marginTop.replace(unit, '')) * zoom;
+    var marginBottomSt =
+      parseFloat(style.marginBottom.replace(unit, '')) * zoom;
     var mtStyle = marginT.style;
     var mbStyle = marginB.style;
     var mlStyle = marginL.style;
@@ -89,54 +92,55 @@ module.exports = {
     var pbStyle = padB.style;
     var plStyle = padL.style;
     var prStyle = padR.style;
-    var posLeft = parseInt(pos.left);
+    var posLeft = parseFloat(pos.left);
+    var widthEl = parseFloat(style.width) * zoom + unit;
 
     // Margin style
-    mtStyle.height = style.marginTop;
-    mtStyle.width = style.width;
-    mtStyle.top = pos.top - style.marginTop.replace(unit, '') + unit;
+    mtStyle.height = marginTopSt + unit;
+    mtStyle.width = widthEl;
+    mtStyle.top = pos.top - marginTopSt + unit;
     mtStyle.left = posLeft + unit;
 
-    mbStyle.height = style.marginBottom;
-    mbStyle.width = style.width;
+    mbStyle.height = marginBottomSt + unit;
+    mbStyle.width = widthEl;
     mbStyle.top = pos.top + pos.height + unit;
     mbStyle.left = posLeft + unit;
 
     var marginSideH = pos.height + marginTopSt + marginBottomSt + unit;
     var marginSideT = pos.top - marginTopSt + unit;
     mlStyle.height = marginSideH;
-    mlStyle.width = style.marginLeft;
+    mlStyle.width = marginLeftSt + unit;
     mlStyle.top = marginSideT;
     mlStyle.left = posLeft - marginLeftSt + unit;
 
     mrStyle.height = marginSideH;
-    mrStyle.width = style.marginRight;
+    mrStyle.width = marginRightSt + unit;
     mrStyle.top = marginSideT;
     mrStyle.left = posLeft + pos.width + unit;
 
     // Padding style
-    var padTop = parseInt(style.paddingTop.replace(unit, ''));
-    ptStyle.height = style.paddingTop;
-    ptStyle.width = style.width;
+    var padTop = parseFloat(style.paddingTop) * zoom;
+    ptStyle.height = padTop + unit;
+    ptStyle.width = widthEl;
     ptStyle.top = pos.top + unit;
     ptStyle.left = posLeft + unit;
 
-    var padBot = parseInt(style.paddingBottom.replace(unit, ''));
-    pbStyle.height = style.paddingBottom;
-    pbStyle.width = style.width;
+    var padBot = parseFloat(style.paddingBottom) * zoom;
+    pbStyle.height = padBot + unit;
+    pbStyle.width = widthEl;
     pbStyle.top = pos.top + pos.height - padBot + unit;
     pbStyle.left = posLeft + unit;
 
     var padSideH = pos.height - padBot - padTop + unit;
     var padSideT = pos.top + padTop + unit;
     plStyle.height = padSideH;
-    plStyle.width = style.paddingLeft;
+    plStyle.width = parseFloat(style.paddingLeft) * zoom + unit;
     plStyle.top = padSideT;
     plStyle.left = pos.left + unit;
 
-    var padRight = parseInt(style.paddingRight.replace(unit, ''));
+    var padRight = parseFloat(style.paddingRight) * zoom;
     prStyle.height = padSideH;
-    prStyle.width = style.paddingRight;
+    prStyle.width = padRight + unit;
     prStyle.top = padSideT;
     prStyle.left = pos.left + pos.width - padRight + unit;
   },
diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 41716f725..2bfdac0fc 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -609,6 +609,10 @@ module.exports = Backbone.Model.extend({
     return this.get('changesCount');
   },
 
+  getZoomDecimal() {
+    return this.get('zoom') / 100;
+  },
+
   /**
    * Destroy editor
    */