Commit c1d11faa by Daniel Dahan

fixed issue where NavigationBar was not resizing when using Storyboards

parent 47b798d8
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '1.42.4' s.version = '1.42.5'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'An animation and graphics framework for Material Design in Swift.' s.summary = 'An animation and graphics framework for Material Design in Swift.'
s.homepage = 'http://cosmicmind.io' s.homepage = 'http://cosmicmind.io'
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.42.4</string> <string>1.42.5</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
...@@ -290,11 +290,11 @@ public class NavigationBar : UINavigationBar { ...@@ -290,11 +290,11 @@ public class NavigationBar : UINavigationBar {
public override func intrinsicContentSize() -> CGSize { public override func intrinsicContentSize() -> CGSize {
switch navigationBarStyle { switch navigationBarStyle {
case .Tiny: case .Tiny:
return CGSize(width: width ?? MaterialDevice.width, height: 32) return CGSize(width: MaterialDevice.width, height: 32)
case .Default: case .Default:
return CGSize(width: width ?? MaterialDevice.width, height: 44) return CGSize(width: MaterialDevice.width, height: 44)
case .Medium: case .Medium:
return CGSize(width: width ?? MaterialDevice.width, height: 56) return CGSize(width: MaterialDevice.width, height: 56)
} }
} }
......
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