updated ControlView dynamic height - respecting now height specified

Sources/iOS/BarView.swift

@@ -83,9 +83,5 @@ public class BarView : ControlView {
 	public override func prepareView() {
 	public override func prepareView() {
 		super.prepareView()
 		super.prepareView()
 		depth = .Depth1
 		depth = .Depth1
-		spacingPreset = .Spacing1
-		contentInsetPreset = .Square1
-		autoresizingMask = .FlexibleWidth
-		shadowPathAutoSizeEnabled = false
 	}
 	}
 }
 }

Sources/iOS/ControlView.swift

@@ -136,6 +136,7 @@ public class ControlView : MaterialView {
 	public init() {
 	public init() {
 		super.init(frame: CGRectZero)
 		super.init(frame: CGRectZero)
 		frame.size = intrinsicContentSize()
 		frame.size = intrinsicContentSize()
+		frame.size.width = MaterialDevice.width
 		prepareView()
 		prepareView()
 	}
 	}
 	
 	
@@ -154,7 +155,6 @@ public class ControlView : MaterialView {
 		super.layoutSubviews()
 		super.layoutSubviews()
 		if willRenderView {
 		if willRenderView {
 			layoutIfNeeded()
 			layoutIfNeeded()
-			frame.size.height = intrinsicContentSize().height
 			
 			
 			let factor: CGFloat = 24
 			let factor: CGFloat = 24
 			if let g: Int = Int(width / factor) {
 			if let g: Int = Int(width / factor) {
@@ -222,6 +222,10 @@ public class ControlView : MaterialView {
 	*/
 	*/
 	public override func prepareView() {
 	public override func prepareView() {
 		super.prepareView()
 		super.prepareView()
+		spacingPreset = .Spacing1
+		contentInsetPreset = .Square1
+		autoresizingMask = .FlexibleWidth
+		shadowPathAutoSizeEnabled = false
 		prepareContentView()
 		prepareContentView()
 	}
 	}
 	
 	

Sources/iOS/SearchBarController.swift

@@ -59,18 +59,19 @@ public class SearchBarController : BarViewController {
 	
 	
 	/// Layout subviews.
 	/// Layout subviews.
 	public func layoutSubviews() {
 	public func layoutSubviews() {
-		let w: CGFloat = MaterialDevice.width
-		let h: CGFloat = MaterialDevice.height
-		
 		if .iPhone == MaterialDevice.type && MaterialDevice.isLandscape {
 		if .iPhone == MaterialDevice.type && MaterialDevice.isLandscape {
 			searchBar.contentInset.top = 4
 			searchBar.contentInset.top = 4
 		} else {
 		} else {
 			searchBar.contentInset.top = 24
 			searchBar.contentInset.top = 24
 		}
 		}
 		
 		
+		let h: CGFloat = MaterialDevice.height
+		let w: CGFloat = MaterialDevice.width
+		let p: CGFloat = searchBar.intrinsicContentSize().height
+		
 		searchBar.width = w
 		searchBar.width = w
+		searchBar.height = p
 		
 		
-		let p: CGFloat = searchBar.intrinsicContentSize().height
 		rootViewController.view.frame.origin.y = p
 		rootViewController.view.frame.origin.y = p
 		rootViewController.view.frame.size.height = h - p
 		rootViewController.view.frame.size.height = h - p
 	}
 	}

Sources/iOS/Toolbar.swift

@@ -77,6 +77,7 @@ public class Toolbar : BarView {
 	/// Basic initializer.
 	/// Basic initializer.
 	public override init() {
 	public override init() {
 		super.init()
 		super.init()
+		print("Toolbar", intrinsicContentSize())
 	}
 	}
 	
 	
 	/**
 	/**

Sources/iOS/ToolbarController.swift

@@ -146,18 +146,19 @@ public class ToolbarController : BarViewController {
 	
 	
 	/// Layout subviews.
 	/// Layout subviews.
 	public func layoutSubviews() {
 	public func layoutSubviews() {
-		let w: CGFloat = MaterialDevice.width
-		let h: CGFloat = MaterialDevice.height
-		
 		if .iPhone == MaterialDevice.type && MaterialDevice.isLandscape {
 		if .iPhone == MaterialDevice.type && MaterialDevice.isLandscape {
 			toolbar.contentInset.top = 4
 			toolbar.contentInset.top = 4
 		} else {
 		} else {
 			toolbar.contentInset.top = 24
 			toolbar.contentInset.top = 24
 		}
 		}
 		
 		
+		let h: CGFloat = MaterialDevice.height
+		let w: CGFloat = MaterialDevice.width
+		let p: CGFloat = toolbar.intrinsicContentSize().height
+		
 		toolbar.width = w
 		toolbar.width = w
+		toolbar.height = p
 		
 		
-		let p: CGFloat = toolbar.intrinsicContentSize().height
 		rootViewController.view.frame.origin.y = p
 		rootViewController.view.frame.origin.y = p
 		rootViewController.view.frame.size.height = h - p
 		rootViewController.view.frame.size.height = h - p
 	}
 	}