Commit 6dd884f2 by Daniel Dahan

Merge branch 'development' into editor

parents 6f688295 744c261a
Pod::Spec.new do |s|
s.name = 'Material'
s.version = '2.3.4'
s.version = '2.3.5'
s.license = 'BSD-3-Clause'
s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.'
s.homepage = 'http://materialswift.com'
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.3.4</string>
<string>2.3.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -47,7 +47,7 @@ open class Bar: View {
}
/// Should center the contentView.
open var contentViewAlignment = ContentViewAlignment.center {
open var contentViewAlignment = ContentViewAlignment.any {
didSet {
layoutSubviews()
}
......
......@@ -305,8 +305,12 @@ extension UIImage {
var outBuffer = createEffectBuffer(context: outContext)
if hasBlur {
let inputRadius = radius * screenScale
var radius = UInt32(floor(inputRadius * 3.0 * CGFloat(sqrt(2 * M_PI)) / 4 + 0.5))
let a = sqrt(2 * M_PI)
let b = CGFloat(a) / 4
let c = radius * screenScale
let d = c * 3.0 * b
var radius = UInt32(floor(d + 0.5))
if 1 != radius % 2 {
radius += 1 // force radius to be odd so that the three box-blur methodology works.
......
......@@ -149,6 +149,7 @@ open class Toolbar: Bar {
open override func prepare() {
super.prepare()
zPosition = 1000
contentViewAlignment = .center
prepareTitleLabel()
prepareDetailLabel()
}
......
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