Commit 0a98c755 by Daniel Dahan Committed by GitHub

Merge pull request #1124 from OrkhanAlikhanov/textfield-cursor

 Fixed issue-1123, TextField is not scrolling
parents ad8508ca 777c8e6c
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '2.17.0' s.version = '2.17.0'
s.swift_version = '4.0' s.swift_version = '4.2'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'A UI/UX framework for creating beautiful applications.' s.summary = 'A UI/UX framework for creating beautiful applications.'
s.homepage = 'http://cosmicmind.com' s.homepage = 'http://cosmicmind.com'
...@@ -21,6 +21,6 @@ Pod::Spec.new do |s| ...@@ -21,6 +21,6 @@ Pod::Spec.new do |s|
'com.cosmicmind.material.fonts' => ['Sources/**/*.ttf'] 'com.cosmicmind.material.fonts' => ['Sources/**/*.ttf']
} }
s.dependency 'Motion', '~> 1.4.3' s.dependency 'Motion', '~> 1.5.0'
end end
end end
...@@ -66,7 +66,7 @@ public protocol TextFieldDelegate: UITextFieldDelegate { ...@@ -66,7 +66,7 @@ public protocol TextFieldDelegate: UITextFieldDelegate {
open class TextField: UITextField { open class TextField: UITextField {
/// Default size when using AutoLayout. /// Default size when using AutoLayout.
open override var intrinsicContentSize: CGSize { open override var intrinsicContentSize: CGSize {
return CGSize(width: bounds.width, height: 32) return CGSize(width: bounds.width, height: max(32, super.intrinsicContentSize.height))
} }
/// A Boolean that indicates if the placeholder label is animated. /// A Boolean that indicates if the placeholder label is animated.
......
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