Commit 72c97306 by Daniel Dahan Committed by GitHub

Merge pull request #873 from mohpor/development

Fixes PlaceholderLabel position when right-aligned - iOS 11.0
parents 30ae213b 8bb125c3
......@@ -33,8 +33,9 @@ class Base: UIControl {
beforeSecondAnimation()
secondAnimation()
}
@objc func didTap() {
@objc
func didTap() {
self.isSelected = !self.isSelected
self.animate()
}
......
......@@ -566,7 +566,7 @@ fileprivate extension TextField {
case .left, .natural:
placeholderLabel.frame.origin.x = w + placeholderHorizontalOffset
case .right:
placeholderLabel.frame.origin.x = bounds.width - placeholderLabel.bounds.width - textInset + placeholderHorizontalOffset
placeholderLabel.frame.origin.x = (bounds.width * (1.0 - placeholderActiveScale)) - textInset + placeholderHorizontalOffset
default:break
}
......@@ -707,7 +707,7 @@ extension TextField {
case .left, .natural:
s.placeholderLabel.frame.origin.x = s.leftViewWidth + s.textInset + s.placeholderHorizontalOffset
case .right:
s.placeholderLabel.frame.origin.x = s.bounds.width - s.placeholderLabel.bounds.width - s.textInset + s.placeholderHorizontalOffset
s.placeholderLabel.frame.origin.x = (s.bounds.width * (1.0 - s.placeholderActiveScale)) - s.textInset + s.placeholderHorizontalOffset
default:break
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment