From 458939cf7dbd1782e1f5745aaf5f13b4f53db096 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Tue, 11 Feb 2020 11:51:28 -0500
Subject: [PATCH] Keep entity sizes constant when changing units

---
 macrovision.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/macrovision.js b/macrovision.js
index 81815b85..4ffe8b0c 100644
--- a/macrovision.js
+++ b/macrovision.js
@@ -325,7 +325,7 @@ function configEntityOptions(entity, view) {
     scaleInput.id = "options-entity-scale";
 
     scaleInput.addEventListener("input", e => {
-        entity.scale = e.target.value;
+        entity.scale = e.target.value == 0 ? 1 : e.target.value;
 
         if (config.autoFit) {
             fitWorld();
@@ -412,7 +412,8 @@ function configViewOptions(entity, view) {
 
 
         input.addEventListener("input", e => {
-            entity.views[view][key] = math.unit(input.value, select.value);
+            const value = input.value == 0 ? 1 : input.value;
+            entity.views[view][key] = math.unit(value, select.value);
 
             if (config.autoFit) {
                 fitWorld();
@@ -422,12 +423,20 @@ function configViewOptions(entity, view) {
             updateViewOptions(entity, view, key);
         });
 
+        select.setAttribute("oldUnit", select.value);
+        
         select.addEventListener("input", e => {
-            entity.views[view][key] = math.unit(input.value, select.value);
+            const value = input.value == 0 ? 1 : input.value;
+            const oldUnit = select.getAttribute("oldUnit");
+            entity.views[view][key] = math.unit(value, oldUnit).to(select.value);
+            input.value = entity.views[view][key].toNumber(select.value);   
+
+            select.setAttribute("oldUnit", select.value);
 
             if (config.autoFit) {
                 fitWorld();
             }
+
             updateSizes();
             updateEntityOptions(entity, view);
             updateViewOptions(entity, view, key);