TouchInstinct
/
TGPControls
312
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UIImage generalization

This commit is contained in:
Xavier Schott 2017-04-14 17:53:02 -07:00
parent 1005779c93
commit 7cc0a2cb19
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
TGPControls/TGPDiscreteSlider.swift
View File

@ -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

13
TGPControlsDemo/TGPControlsDemo/Base.lproj/Main.storyboard
View File

@ -134,9 +134,9 @@
<userDefinedRuntimeAttribute type="number" keyPath="incrementValue">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="thumbImage" value="thumb"/>
<userDefinedRuntimeAttribute type="string" keyPath="tickImage" value="tick"/>
<userDefinedRuntimeAttribute type="string" keyPath="trackImage" value="track"/>
<userDefinedRuntimeAttribute type="image" keyPath="trackImage" value="track"/>
<userDefinedRuntimeAttribute type="image" keyPath="tickImage" value="tick"/>
<userDefinedRuntimeAttribute type="image" keyPath="thumbImage" value="thumb"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jca-ht-ahJ" userLabel="pictureLabels" customClass="TGPCamelLabels" customModule="TGPControls">
@ -374,7 +374,7 @@
<color key="value" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="thumbShadowRadius">
<real key="value" value="4"/>
<real key="value" value="0.0"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="size" keyPath="thumbShadowOffset">
<size key="value" width="0.0" height="0.0"/>
@ -501,4 +501,9 @@
<point key="canvasLocation" x="344.5" y="332.5"/>
</scene>
</scenes>
<resources>
<image name="thumb" width="11" height="11"/>
<image name="tick" width="2" height="7"/>
<image name="track" width="300" height="21"/>
</resources>
</document>