Merge branch 'charlesmchen/capButtonTextSize'

This commit is contained in:
Matthew Chen 2017-09-29 12:30:23 -04:00
commit 3eb4274937

View file

@ -99,7 +99,9 @@ import Foundation
}
public class func fontForHeight(_ height: CGFloat) -> UIFont {
let fontPointSize = round(height * 0.45)
// Cap the "button height" at 40pt or button text can look
// excessively large.
let fontPointSize = round(min(40, height) * 0.45)
return UIFont.ows_mediumFont(withSize:fontPointSize)!
}