Commit e577cfa3 by Daniel Dahan

updated ControlView dynamic height - respecting now height specified

parent 418dc317
......@@ -83,9 +83,5 @@ public class BarView : ControlView {
public override func prepareView() {
super.prepareView()
depth = .Depth1
spacingPreset = .Spacing1
contentInsetPreset = .Square1
autoresizingMask = .FlexibleWidth
shadowPathAutoSizeEnabled = false
}
}
......@@ -136,6 +136,7 @@ public class ControlView : MaterialView {
public init() {
super.init(frame: CGRectZero)
frame.size = intrinsicContentSize()
frame.size.width = MaterialDevice.width
prepareView()
}
......@@ -154,7 +155,6 @@ public class ControlView : MaterialView {
super.layoutSubviews()
if willRenderView {
layoutIfNeeded()
frame.size.height = intrinsicContentSize().height
let factor: CGFloat = 24
if let g: Int = Int(width / factor) {
......@@ -222,6 +222,10 @@ public class ControlView : MaterialView {
*/
public override func prepareView() {
super.prepareView()
spacingPreset = .Spacing1
contentInsetPreset = .Square1
autoresizingMask = .FlexibleWidth
shadowPathAutoSizeEnabled = false
prepareContentView()
}
......
......@@ -59,18 +59,19 @@ public class SearchBarController : BarViewController {
/// Layout subviews.
public func layoutSubviews() {
let w: CGFloat = MaterialDevice.width
let h: CGFloat = MaterialDevice.height
if .iPhone == MaterialDevice.type && MaterialDevice.isLandscape {
searchBar.contentInset.top = 4
} else {
searchBar.contentInset.top = 24
}
let h: CGFloat = MaterialDevice.height
let w: CGFloat = MaterialDevice.width
let p: CGFloat = searchBar.intrinsicContentSize().height
searchBar.width = w
searchBar.height = p
let p: CGFloat = searchBar.intrinsicContentSize().height
rootViewController.view.frame.origin.y = p
rootViewController.view.frame.size.height = h - p
}
......
......@@ -77,6 +77,7 @@ public class Toolbar : BarView {
/// Basic initializer.
public override init() {
super.init()
print("Toolbar", intrinsicContentSize())
}
/**
......
......@@ -146,18 +146,19 @@ public class ToolbarController : BarViewController {
/// Layout subviews.
public func layoutSubviews() {
let w: CGFloat = MaterialDevice.width
let h: CGFloat = MaterialDevice.height
if .iPhone == MaterialDevice.type && MaterialDevice.isLandscape {
toolbar.contentInset.top = 4
} else {
toolbar.contentInset.top = 24
}
let h: CGFloat = MaterialDevice.height
let w: CGFloat = MaterialDevice.width
let p: CGFloat = toolbar.intrinsicContentSize().height
toolbar.width = w
toolbar.height = p
let p: CGFloat = toolbar.intrinsicContentSize().height
rootViewController.view.frame.origin.y = p
rootViewController.view.frame.size.height = h - p
}
......
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