Skip to content

Commit 0d9ba87

Browse files
author
Dmitry Utmanov
committed
Fixed bug [raulriera#98](raulriera#98) Wrong indictor position when set placeholder
1 parent 19c933e commit 0d9ba87

File tree

11 files changed

+41
-12
lines changed

11 files changed

+41
-12
lines changed

‎TextFieldEffects/TextFieldEffects/AkiraTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ import UIKit
5151
}
5252
}
5353

54+
private var _placeholder: String?
5455
override open var placeholder: String? {
5556
didSet {
57+
_placeholder = placeholder
5658
updatePlaceholder()
5759
}
5860
}
@@ -95,7 +97,8 @@ import UIKit
9597

9698
private func updatePlaceholder() {
9799
placeholderLabel.frame = placeholderRect(forBounds: bounds)
98-
placeholderLabel.text = placeholder
100+
placeholderLabel.text = _placeholder
101+
super.placeholder = nil
99102
placeholderLabel.font = placeholderFontFromFont(font!)
100103
placeholderLabel.textColor = placeholderColor
101104
placeholderLabel.textAlignment = textAlignment

‎TextFieldEffects/TextFieldEffects/HoshiTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ import UIKit
5757
}
5858
}
5959

60+
private var _placeholder: String?
6061
override open var placeholder: String? {
6162
didSet {
63+
_placeholder = placeholder
6264
updatePlaceholder()
6365
}
6466
}
@@ -137,7 +139,8 @@ import UIKit
137139
}
138140

139141
private func updatePlaceholder() {
140-
placeholderLabel.text = placeholder
142+
placeholderLabel.text = _placeholder
143+
super.placeholder = nil
141144
placeholderLabel.textColor = placeholderColor
142145
placeholderLabel.sizeToFit()
143146
layoutPlaceholderInTextRect()

‎TextFieldEffects/TextFieldEffects/IsaoTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ import UIKit
4646
}
4747
}
4848

49+
private var _placeholder: String?
4950
override open var placeholder: String? {
5051
didSet {
52+
_placeholder = placeholder
5153
updatePlaceholder()
5254
}
5355
}
@@ -101,7 +103,8 @@ import UIKit
101103
}
102104

103105
private func updatePlaceholder() {
104-
placeholderLabel.text = placeholder
106+
placeholderLabel.text = _placeholder
107+
super.placeholder = nil
105108
placeholderLabel.textColor = inactiveColor
106109
placeholderLabel.sizeToFit()
107110
layoutPlaceholderInTextRect()

‎TextFieldEffects/TextFieldEffects/JiroTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ import UIKit
4646
}
4747
}
4848

49+
private var _placeholder: String?
4950
override open var placeholder: String? {
5051
didSet {
52+
_placeholder = placeholder
5153
updatePlaceholder()
5254
}
5355
}
@@ -113,7 +115,8 @@ import UIKit
113115
}
114116

115117
private func updatePlaceholder() {
116-
placeholderLabel.text = placeholder
118+
placeholderLabel.text = _placeholder
119+
super.placeholder = nil
117120
placeholderLabel.textColor = placeholderColor
118121
placeholderLabel.sizeToFit()
119122
layoutPlaceholderInTextRect()

‎TextFieldEffects/TextFieldEffects/KaedeTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ import UIKit
4646
}
4747
}
4848

49+
private var _placeholder: String?
4950
override open var placeholder: String? {
5051
didSet {
52+
_placeholder = placeholder
5153
updatePlaceholder()
5254
}
5355
}
@@ -116,7 +118,8 @@ import UIKit
116118
}
117119

118120
private func updatePlaceholder() {
119-
placeholderLabel.text = placeholder
121+
placeholderLabel.text = _placeholder
122+
super.placeholder = nil
120123
placeholderLabel.textColor = placeholderColor
121124
}
122125

‎TextFieldEffects/TextFieldEffects/MadokaTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ import UIKit
4646
}
4747
}
4848

49+
private var _placeholder: String?
4950
override open var placeholder: String? {
5051
didSet {
52+
_placeholder = placeholder
5153
updatePlaceholder()
5254
}
5355
}
@@ -130,7 +132,8 @@ import UIKit
130132
}
131133

132134
private func updatePlaceholder() {
133-
placeholderLabel.text = placeholder
135+
placeholderLabel.text = _placeholder
136+
super.placeholder = nil
134137
placeholderLabel.textColor = placeholderColor
135138
placeholderLabel.sizeToFit()
136139
layoutPlaceholderInTextRect()

‎TextFieldEffects/TextFieldEffects/MinoruTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ import UIKit
4444
}
4545
}
4646

47+
private var _placeholder: String?
4748
override open var placeholder: String? {
4849
didSet {
50+
_placeholder = placeholder
4951
updatePlaceholder()
5052
}
5153
}
@@ -108,7 +110,8 @@ import UIKit
108110
}
109111

110112
private func updatePlaceholder() {
111-
placeholderLabel.text = placeholder
113+
placeholderLabel.text = _placeholder
114+
super.placeholder = nil
112115
placeholderLabel.textColor = placeholderColor
113116
placeholderLabel.sizeToFit()
114117
layoutPlaceholderInTextRect()

‎TextFieldEffects/TextFieldEffects/YokoTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ import UIKit
4646
}
4747
}
4848

49+
private var _placeholder: String?
4950
override open var placeholder: String? {
5051
didSet {
52+
_placeholder = placeholder
5153
updatePlaceholder()
5254
}
5355
}
@@ -115,7 +117,8 @@ import UIKit
115117

116118
private func updatePlaceholder() {
117119
placeholderLabel.font = placeholderFontFromFont(font!)
118-
placeholderLabel.text = placeholder
120+
placeholderLabel.text = _placeholder
121+
super.placeholder = nil
119122
placeholderLabel.textColor = placeholderColor
120123
placeholderLabel.sizeToFit()
121124
layoutPlaceholderInTextRect()

‎TextFieldEffects/TextFieldEffects/YoshikoTextField.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ import UIKit
8787
}
8888
}
8989

90+
private var _placeholder: String?
9091
override open var placeholder: String? {
9192
didSet {
93+
_placeholder = placeholder
9294
updatePlaceholder()
9395
}
9496
}
@@ -111,7 +113,8 @@ import UIKit
111113

112114
private func updatePlaceholder() {
113115
placeholderLabel.frame = placeholderRect(forBounds: bounds)
114-
placeholderLabel.text = placeholder
116+
placeholderLabel.text = _placeholder
117+
super.placeholder = nil
115118
placeholderLabel.textAlignment = textAlignment
116119

117120
if isFirstResponder || text!.isNotEmpty {

‎TextFieldEffects/TextFieldsDemo/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
17+
private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

0 commit comments

Comments
 (0)