- Fix: Adjust side panel width checking based on device zoom (fixes S…

…VG-Edit#298)
brettz9 · Oct 30, 2018 · cdb31d3 · cdb31d3
1 parent 9b9c900
commit cdb31d3
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,6 @@
 # ?
 
+- Fix: Adjust side panel width checking based on device zoom (fixes #298)
 - Linting (ESLint compat): Add eslint-plugin-compat to get browser support
     warnings
 - Docs (README): Indicate minimal polyfills needed for older browsers

diff --git a/dist/index-es.js b/dist/index-es.js
@@ -32988,8 +32988,11 @@ editor.init = function () {
 
 
   var toggleSidePanel = function toggleSidePanel(close) {
+    var dpr = window.devicePixelRatio || 1;
     var w = $$b('#sidepanels').width();
-    var deltaX = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w;
+    var isOpened = (dpr < 1 ? w : w / dpr) > 2;
+    var zoomAdjustedSidepanelWidth = (dpr < 1 ? 1 : dpr) * SIDEPANEL_OPENWIDTH;
+    var deltaX = (isOpened || close ? 0 : zoomAdjustedSidepanelWidth) - w;
     changeSidePanelWidth(deltaX);
   };
 

diff --git a/dist/index-es.min.js b/dist/index-es.min.js
diff --git a/dist/index-es.min.js.map b/dist/index-es.min.js.map
diff --git a/dist/index-umd.js b/dist/index-umd.js
@@ -32994,8 +32994,11 @@
 
 
     var toggleSidePanel = function toggleSidePanel(close) {
+      var dpr = window.devicePixelRatio || 1;
       var w = $$b('#sidepanels').width();
-      var deltaX = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w;
+      var isOpened = (dpr < 1 ? w : w / dpr) > 2;
+      var zoomAdjustedSidepanelWidth = (dpr < 1 ? 1 : dpr) * SIDEPANEL_OPENWIDTH;
+      var deltaX = (isOpened || close ? 0 : zoomAdjustedSidepanelWidth) - w;
       changeSidePanelWidth(deltaX);
     };
 

diff --git a/dist/index-umd.min.js b/dist/index-umd.min.js
diff --git a/dist/index-umd.min.js.map b/dist/index-umd.min.js.map
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
@@ -5018,8 +5018,11 @@ editor.init = function () {
    * @returns {undefined}
    */
   const toggleSidePanel = function (close) {
+    const dpr = window.devicePixelRatio || 1;
     const w = $('#sidepanels').width();
-    const deltaX = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w;
+    const isOpened = (dpr < 1 ? w : w / dpr) > 2;
+    const zoomAdjustedSidepanelWidth = (dpr < 1 ? 1 : dpr) * SIDEPANEL_OPENWIDTH;
+    const deltaX = (isOpened || close ? 0 : zoomAdjustedSidepanelWidth) - w;
     changeSidePanelWidth(deltaX);
   };
 

diff --git a/editor/xdomain-svgedit-config-iife.js b/editor/xdomain-svgedit-config-iife.js
@@ -32991,8 +32991,11 @@
 
 
     var toggleSidePanel = function toggleSidePanel(close) {
+      var dpr = window.devicePixelRatio || 1;
       var w = $$b('#sidepanels').width();
-      var deltaX = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w;
+      var isOpened = (dpr < 1 ? w : w / dpr) > 2;
+      var zoomAdjustedSidepanelWidth = (dpr < 1 ? 1 : dpr) * SIDEPANEL_OPENWIDTH;
+      var deltaX = (isOpened || close ? 0 : zoomAdjustedSidepanelWidth) - w;
       changeSidePanelWidth(deltaX);
     };
 

diff --git a/svgedit-config-iife.js b/svgedit-config-iife.js
@@ -32991,8 +32991,11 @@
 
 
     var toggleSidePanel = function toggleSidePanel(close) {
+      var dpr = window.devicePixelRatio || 1;
       var w = $$b('#sidepanels').width();
-      var deltaX = (w > 2 || close ? 2 : SIDEPANEL_OPENWIDTH) - w;
+      var isOpened = (dpr < 1 ? w : w / dpr) > 2;
+      var zoomAdjustedSidepanelWidth = (dpr < 1 ? 1 : dpr) * SIDEPANEL_OPENWIDTH;
+      var deltaX = (isOpened || close ? 0 : zoomAdjustedSidepanelWidth) - w;
       changeSidePanelWidth(deltaX);
     };