Skip to content

Commit bf24553

Browse files
committed
Set the view's tintAdjustmentMode when disabled rather than computing a custom dimmed tint color
1 parent 4a10895 commit bf24553

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

TactileSlider/Classes/TactileSlider.swift

+1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ import UIKit
173173
override open var isEnabled: Bool {
174174
didSet {
175175
renderer.grayedOut = !isEnabled
176+
tintAdjustmentMode = isEnabled ? .automatic : .dimmed
176177
}
177178
}
178179

TactileSlider/Classes/TactileSliderLayerRenderer.swift

+1-16
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,10 @@ internal class TactileSliderLayerRenderer {
1919

2020
var thumbTint: UIColor = .white {
2121
didSet {
22-
thumbLayer.fillColor = grayedOut ? disabledThumbTint.cgColor : thumbTint.cgColor
22+
thumbLayer.fillColor = thumbTint.cgColor
2323
}
2424
}
2525

26-
private var disabledThumbTint: UIColor {
27-
// get HSV from normal tint color
28-
var tintHue: CGFloat = 0
29-
var tintSaturation: CGFloat = 0
30-
var tintBrightness: CGFloat = 0
31-
var tintAlpha: CGFloat = 0
32-
guard thumbTint.getHue(&tintHue, saturation: &tintSaturation, brightness: &tintBrightness, alpha: &tintAlpha) else {
33-
return UIColor.gray
34-
}
35-
36-
return UIColor(hue: tintHue, saturation: tintSaturation/10, brightness: tintBrightness*0.8, alpha: tintAlpha*0.6)
37-
}
38-
3926
var cornerRadius: CGFloat = 10 {
4027
didSet {
4128
updateMaskLayerPath()
@@ -92,8 +79,6 @@ internal class TactileSliderLayerRenderer {
9279
private func updateGrayedOut() {
9380
let alpha: Float = grayedOut ? 0.6 : 1
9481
trackLayer.opacity = alpha
95-
96-
thumbLayer.fillColor = grayedOut ? disabledThumbTint.cgColor : thumbTint.cgColor
9782
}
9883

9984
private func updatePopUp() {

0 commit comments

Comments
 (0)