From cf73d625b990a730bb0c9c2fee0f1d2aef70a9ca Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 3 Oct 2018 10:00:56 +0200
Subject: [PATCH] Chart aspect ratio buttom improved

---
 BottomSpace/ChartAspectRatio.js |   9 ++++++---
 Images/Icons/chart-scale.png    | Bin 0 -> 343 bytes
 Images/aspect.ratio.Y.png       | Bin 3018 -> 0 bytes
 ViewPort.js                     |  11 ++++++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 Images/Icons/chart-scale.png
 delete mode 100644 Images/aspect.ratio.Y.png

diff --git a/BottomSpace/ChartAspectRatio.js b/BottomSpace/ChartAspectRatio.js
index c5e6e7063..bdf41b6eb 100644
--- a/BottomSpace/ChartAspectRatio.js
+++ b/BottomSpace/ChartAspectRatio.js
@@ -44,7 +44,7 @@
             canDrawIcon = true;
         }
 
-        icon.src = "Images/aspect.ratio.Y.png";
+        icon.src = "Images/Icons/chart-scale.png";
 
         thisObject.container.eventHandler.listenToEvent('Mouse Wheel', onMouseWheel);
 
@@ -52,6 +52,8 @@
 
     function onMouseWheel(pDelta) {
 
+        if (viewPort.isMinZoom() === false) { return; } // We only make this button to work at the min zoom level.
+
         if (pDelta < 0) {
             pDelta = -0.1;
         } else {
@@ -100,11 +102,12 @@
         thisObject.container.frame.draw(false, false);
 
         if (canDrawIcon === false) { return; }
+        if (viewPort.isMinZoom() === false) { return; } // We only show this button at the min zoom level.
 
         let breakpointsHeight = 15;
 
-        let imageHeight = 30;
-        let imageWidth = 30;
+        let imageHeight = 15;
+        let imageWidth = 15;
 
         let imagePoint = {
             x: 10,
diff --git a/Images/Icons/chart-scale.png b/Images/Icons/chart-scale.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcffba53ff3919d2b54811dde3b684dafc918bad
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTQ<As43&a2R{xkc5JkA1-$YLPv
z0mg18v+aP4nVv3=As)xyUc1ZHpuoeL&?{FNd;PE6uadxtXG4oaI!am`dieijiV4p1
z{668coJre7O~qUm28EVS(~SMRl8a6W%$+zzQmM4ZOVLVJ)mo(R&LP!}i<o~pS5{q)
zZd(+3|B79l@?p>Q`B}Zrm*Wmz&-v^5C0}~AYrpN$`T8@IJc4+hmzFHKu}9;T@9sc8
zwnx#@lhPBDcH2i8^F`FGK3m^c3v{GviEBhjN@7W>RdP`(kYX@0FtpG$G|)9L4lyvY
tGBvX@G}JXPwK6b}xYcfeq9HdwB{QuOw}#Ai`yQYM22WQ%mvv4FO#mlNaistN

literal 0
HcmV?d00001

diff --git a/Images/aspect.ratio.Y.png b/Images/aspect.ratio.Y.png
deleted file mode 100644
index f5a4ce7d4aa2514981c90ff38a339b0a468906a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3018
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

diff --git a/ViewPort.js b/ViewPort.js
index 53242a218..6213c15b1 100644
--- a/ViewPort.js
+++ b/ViewPort.js
@@ -8,6 +8,7 @@ function newViewPort() {
     const BOTTOM_MARGIN = 15 + BOTTOM_SPACE_HEIGHT;
     const LEFT_MARGIN = 50;
     const RIGHT_MARGIN = 50;
+    const MIN_ZOOM_LEVEL = -28.25
 
     let thisObject = {
         visibleArea: undefined,
@@ -17,6 +18,7 @@ function newViewPort() {
         mousePosition: undefined,
         newZoomLevel: newZoomLevel,
         applyZoom: applyZoom,
+        isMinZoom: isMinZoom,
         zoomFontSize: zoomFontSize,
         zoomThisPoint: zoomThisPoint,
         unzoomThisPoint: unzoomThisPoint,
@@ -169,6 +171,13 @@ function newViewPort() {
        return true;
    }
 
+   function isMinZoom() {
+       /* returns true is we are currently at the min zoom level. */
+
+       if (thisObject.zoomTargetLevel === MIN_ZOOM_LEVEL) { return true; } else { return false;}
+
+   }
+
     function applyZoom(amount) {
 
         //console.log("applyZoom amount: " + amount);
@@ -216,7 +225,7 @@ function newViewPort() {
             amount = amount / 4;
         }
 
-        if (thisObject.zoomTargetLevel + amount < -28.25) {
+        if (thisObject.zoomTargetLevel + amount < MIN_ZOOM_LEVEL) {
             return false;
         }