From 0524216bbd1018ce4b2939653ad33d6ea434ab18 Mon Sep 17 00:00:00 2001 From: Niels van Hoorn Date: Mon, 9 Oct 2017 09:00:51 +0200 Subject: [PATCH] Fixing slider calculations for dpr changes --- framer/Components/RangeSliderComponent.coffee | 7 ++----- framer/Components/SliderComponent.coffee | 9 ++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/framer/Components/RangeSliderComponent.coffee b/framer/Components/RangeSliderComponent.coffee index b912bb102..a563a7638 100644 --- a/framer/Components/RangeSliderComponent.coffee +++ b/framer/Components/RangeSliderComponent.coffee @@ -103,11 +103,8 @@ class exports.RangeSliderComponent extends Layer _touchStart: (event) => event.preventDefault() - offsetX = (@min / @canvasScaleX()) - @min - offsetY = (@min / @canvasScaleY()) - @min - if @width > @height - clickedValue = @valueForPoint(Events.touchEvent(event).clientX - @screenScaledFrame().x) / @canvasScaleX() - offsetX + clickedValue = @valueForPoint((Events.touchEvent(event).clientX / @canvasScaleX()) - @screenScaledFrame().x) if clickedValue > @maxValue @maxValue = clickedValue @@ -120,7 +117,7 @@ class exports.RangeSliderComponent extends Layer @emit(Events.SliderMinValueChange, @minValue) else - clickedValue = @valueForPoint(Events.touchEvent(event).clientY - @screenScaledFrame().y) / @canvasScaleY() - offsetY + clickedValue = @valueForPoint((Events.touchEvent(event).clientY / @canvasScaleY()) - @screenScaledFrame().y) if clickedValue > @maxValue @maxValue = clickedValue diff --git a/framer/Components/SliderComponent.coffee b/framer/Components/SliderComponent.coffee index 590e8deb6..13afd7cc4 100644 --- a/framer/Components/SliderComponent.coffee +++ b/framer/Components/SliderComponent.coffee @@ -93,13 +93,12 @@ class exports.SliderComponent extends Layer _touchStart: (event) => event.preventDefault() - offsetX = (@min / @canvasScaleX()) - @min - offsetY = (@min / @canvasScaleY()) - @min - if @width > @height - @value = @valueForPoint(Events.touchEvent(event).clientX - @screenScaledFrame().x) / @canvasScaleX() - offsetX + scaleX = @canvasScaleX() + @value = @valueForPoint((Events.touchEvent(event).clientX / scaleX) - @screenScaledFrame().x) else - @value = @valueForPoint(Events.touchEvent(event).clientY - @screenScaledFrame().y) / @canvasScaleY() - offsetY + scaleY = @canvasScaleY() + @value = @valueForPoint((Events.touchEvent(event).clientY / scaleY) - @screenScaledFrame().y) @knob.draggable._touchStart(event) @_updateValue()