Added gapBetweenThumbs to avoid overlapping

warchimede · Jan 22, 2015 · c857bd1 · c857bd1
1 parent 4f2dacf
commit c857bd1
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/RangeSlider.xcodeproj/project.pbxproj b/RangeSlider.xcodeproj/project.pbxproj
diff --git a/RangeSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/RangeSlider.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/RangeSlider.xcodeproj/project.xcworkspace/xcshareddata/RangeSlider.xccheckout b/RangeSlider.xcodeproj/project.xcworkspace/xcshareddata/RangeSlider.xccheckout
diff --git a/RangeSlider.xcodeproj/xcuserdata/williamarchimede.xcuserdatad/xcschemes/RangeSlider.xcscheme b/RangeSlider.xcodeproj/xcuserdata/williamarchimede.xcuserdatad/xcschemes/RangeSlider.xcscheme
diff --git a/...ider.xcodeproj/xcuserdata/williamarchimede.xcuserdatad/xcschemes/xcschememanagement.plist b/...ider.xcodeproj/xcuserdata/williamarchimede.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/RangeSlider/AppDelegate.swift b/RangeSlider/AppDelegate.swift
diff --git a/RangeSlider/Base.lproj/Main.storyboard b/RangeSlider/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6206.9" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7026.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
     </dependencies>
     <scenes>
         <!--View Controller-->

diff --git a/RangeSlider/Images.xcassets/AppIcon.appiconset/Contents.json b/RangeSlider/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/RangeSlider/Images.xcassets/LaunchImage.launchimage/Contents.json b/RangeSlider/Images.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/RangeSlider/Info.plist b/RangeSlider/Info.plist
diff --git a/RangeSlider/RangeSlider.swift b/RangeSlider/RangeSlider.swift
@@ -106,6 +106,10 @@ class RangeSlider: UIControl {
         }
     }
 
+    var gapBetweenThumbs: Double {
+        return Double(thumbWidth)*(maximumValue - minimumValue) / Double(bounds.width)
+    }
+
     var trackTintColor: UIColor = UIColor(white: 0.9, alpha: 1.0) {
         didSet {
             trackLayer.setNeedsDisplay()
@@ -232,11 +236,9 @@ class RangeSlider: UIControl {
 
         // Update the values
         if lowerThumbLayer.highlighted {
-            lowerValue += deltaValue
-            lowerValue = boundValue(lowerValue, toLowerValue: minimumValue, upperValue: upperValue)
+            lowerValue = boundValue(lowerValue + deltaValue, toLowerValue: minimumValue, upperValue: upperValue - gapBetweenThumbs)
         } else if upperThumbLayer.highlighted {
-            upperValue += deltaValue
-            upperValue = boundValue(upperValue, toLowerValue: lowerValue, upperValue: maximumValue)
+            upperValue = boundValue(upperValue + deltaValue, toLowerValue: lowerValue + gapBetweenThumbs, upperValue: maximumValue)
         }
 
         sendActionsForControlEvents(.ValueChanged)

diff --git a/RangeSlider/ViewController.swift b/RangeSlider/ViewController.swift
diff --git a/RangeSliderTests/Info.plist b/RangeSliderTests/Info.plist
diff --git a/RangeSliderTests/RangeSliderTests.swift b/RangeSliderTests/RangeSliderTests.swift
diff --git a/Screenshot.png b/Screenshot.png