From 4a0948d905ae93a25cd27b6e87c249f87b884e8a Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Wed, 18 Mar 2020 18:43:01 -0400 Subject: [PATCH] Make the scale sliders bigger and fix them getting stuck --- macrovision.css | 5 +++-- macrovision.js | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/macrovision.css b/macrovision.css index 0f3e43bb..c0ff80ba 100644 --- a/macrovision.css +++ b/macrovision.css @@ -437,6 +437,7 @@ a { z-index: 1000; width: 250px; height: 50px; + transform: scale(1.5); } body.toggle-scale-sliders .floating-slider { @@ -444,7 +445,7 @@ body.toggle-scale-sliders .floating-slider { } #slider-scale { - top: 1%; + top: 5%; left: 5%; } @@ -457,7 +458,7 @@ body.toggle-scale-sliders .floating-slider { } #slider-entity-scale { - top: 1%; + top: 5%; right: 5%; } diff --git a/macrovision.js b/macrovision.js index a1d82bd2..178791be 100644 --- a/macrovision.js +++ b/macrovision.js @@ -962,10 +962,16 @@ window.onfocus = function () { } function doSliderScale() { + if (sliderScale == 1) { + clearInterval(dragScaleHandle); + } setWorldHeight(config.height, math.multiply(config.height, (9 + sliderScale) / 10)); } function doSliderEntityScale() { + if (sliderEntityScale == 1) { + clearInterval(dragEntityScaleHandle); + } if (selected) { const entity = entities[selected.dataset.key]; entity.scale *= (9 + sliderEntityScale) / 10; @@ -1047,11 +1053,13 @@ document.addEventListener("DOMContentLoaded", () => { }); document.querySelector("#slider-scale").addEventListener("mousedown", e => { + clearInterval(dragScaleHandle); dragScaleHandle = setInterval(doSliderScale, 50); e.stopPropagation(); }); document.querySelector("#slider-scale").addEventListener("touchstart", e => { + clearInterval(dragScaleHandle); dragScaleHandle = setInterval(doSliderScale, 50); e.stopPropagation(); }); @@ -1072,11 +1080,13 @@ document.addEventListener("DOMContentLoaded", () => { }); document.querySelector("#slider-entity-scale").addEventListener("mousedown", e => { + clearInterval(dragEntityScaleHandle); dragEntityScaleHandle = setInterval(doSliderEntityScale, 50); e.stopPropagation(); }); document.querySelector("#slider-entity-scale").addEventListener("touchstart", e => { + clearInterval(dragEntityScaleHandle); dragEntityScaleHandle = setInterval(doSliderEntityScale, 50); e.stopPropagation(); });