diff --git a/TGPControls/TGPDiscreteSlider.swift b/TGPControls/TGPDiscreteSlider.swift index a7ce8b2..32b13c1 100644 --- a/TGPControls/TGPDiscreteSlider.swift +++ b/TGPControls/TGPDiscreteSlider.swift @@ -128,18 +128,15 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { } } - @IBInspectable public var thumbImage:String? = nil { + @IBInspectable public var thumbImage:UIImage? = nil { didSet { - // Associate image to layer NSBundle.bundleForClass(class) - if let imageName = thumbImage, - let image = UIImage(named: imageName) { - thumbLayer.contents = image.cgImage + if let thumbImage = thumbImage { + thumbLayer.contents = thumbImage.cgImage } - layoutTrack() } } - + @IBInspectable public var thumbShadowRadius:CGFloat = 0 { didSet { layoutTrack() @@ -590,9 +587,8 @@ public class TGPDiscreteSlider:TGPSlider_INTERFACE_BUILDER { + (iOSThumbShadowOffset.height * 2)) case .image: - if let thumbImage = thumbImage, - let image = UIImage(named: thumbImage) { - return image.size + if let thumbImage = thumbImage { + return thumbImage.size } fallthrough diff --git a/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard b/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard index 95456c8..e1ad42a 100755 --- a/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard +++ b/TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard @@ -134,9 +134,9 @@ - - - + + + @@ -374,7 +374,7 @@ - + @@ -501,4 +501,9 @@ + + + + +