Commit 7092f41e by Daniel Dahan

master: fixed issue-678 where views were Card contentView was incorrectly displaying views

parent 6bae2546
Pod::Spec.new do |s|
s.name = 'Material'
s.version = '2.4.15'
s.version = '2.4.16'
s.license = 'BSD-3-Clause'
s.summary = 'An animation and graphics framework for Material Design in Swift.'
s.homepage = 'http://materialswift.com'
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.4.15</string>
<string>2.4.16</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -233,9 +233,8 @@ open class Card: PulseView {
let w = container.width - insets.left - insets.right
var h = view.height
(view as? UILabel)?.sizeToFit()
if 0 == h {
if 0 == h || nil != view as? UILabel {
(view as? UILabel)?.sizeToFit()
h = view.sizeThatFits(CGSize(width: w, height: CGFloat.greatestFiniteMagnitude)).height
}
......
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