Fixing slider calculations for dpr changes

koenbok · Oct 9, 2017 · 0524216 · 0524216
1 parent b274bf2
commit 0524216
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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()