Skip to content

Fixed bottom border color #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
osrl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed bottom border color #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
037e3d8
fixed disabling floating placeholder doesn't let you set bottom borde…
Nov 26, 2015
8786252
added attributedPlaceholder
Dec 8, 2015
7c99c48
fixed attributed placeholder
Dec 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions Source/MKTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ public class MKTextField : UITextField {
updateFloatingLabelText()
}
}

override public var attributedPlaceholder: NSAttributedString? {
didSet {
updateFloatingLabelText()
}
}

override public var bounds: CGRect {
didSet {
mkLayer.superLayerDidResize()
Expand Down Expand Up @@ -125,7 +132,11 @@ public class MKTextField : UITextField {

override public func layoutSubviews() {
super.layoutSubviews()


bottomBorderLayer?.backgroundColor = isFirstResponder() ? tintColor.CGColor : bottomBorderColor.CGColor
let borderWidth = isFirstResponder() ? bottomBorderHighlightWidth : bottomBorderWidth
bottomBorderLayer?.frame = CGRect(x: 0, y: layer.bounds.height - borderWidth, width: layer.bounds.width, height: borderWidth)

if !floatingPlaceholderEnabled {
return
}
Expand All @@ -138,10 +149,6 @@ public class MKTextField : UITextField {
} else {
hideFloatingLabel()
}

bottomBorderLayer?.backgroundColor = isFirstResponder() ? tintColor.CGColor : bottomBorderColor.CGColor
let borderWidth = isFirstResponder() ? bottomBorderHighlightWidth : bottomBorderWidth
bottomBorderLayer?.frame = CGRect(x: 0, y: layer.bounds.height - borderWidth, width: layer.bounds.width, height: borderWidth)
}

override public func textRectForBounds(bounds: CGRect) -> CGRect {
Expand Down Expand Up @@ -198,7 +205,7 @@ private extension MKTextField {
}

private func updateFloatingLabelText() {
floatingLabel.text = placeholder
floatingLabel.attributedText = attributedPlaceholder
floatingLabel.sizeToFit()
setFloatingLabelOverlapTextField()
}
Expand Down