Skip to content

M
Material
Commit 1b176a52 by Daniel Dahan
Options

Merge pull request #351 from mohpor/development 

Fixes TextField font and storyboard placeholder setter
parents d3650f18 2a401dc9
Showing with 3 additions and 5 deletions
Sources/iOS/TextField.swift
...@@ -147,11 +147,8 @@ public class TextField : UITextField { ...@@ -147,11 +147,8 @@ public class TextField : UITextField {
/// The placeholderLabel font value. /// The placeholderLabel font value.
@IBInspectable public override var font: UIFont? { @IBInspectable public override var font: UIFont? {
get { didSet {
return placeholderLabel.font placeholderLabel.font = self.font
}
set(value) {
placeholderLabel.font = value
} }
} }
...@@ -454,6 +451,7 @@ public class TextField : UITextField { ...@@ -454,6 +451,7 @@ public class TextField : UITextField {
masksToBounds = false masksToBounds = false
borderStyle = .None borderStyle = .None
backgroundColor = nil backgroundColor = nil
super.placeholder = nil
textColor = MaterialColor.darkText.primary textColor = MaterialColor.darkText.primary
font = RobotoFont.regularWithSize(16) font = RobotoFont.regularWithSize(16)
prepareDivider() prepareDivider()
......
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