Merge remote-tracking branch 'origin/develop' into bugfix/label_range_safety
This commit is contained in:
commit
b3667dc868
@ -41,7 +41,7 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol {
|
||||
}
|
||||
super.setDefaults()
|
||||
button.style = .secondary
|
||||
button.size = .tiny
|
||||
button.size = .small
|
||||
}
|
||||
|
||||
//--------------------------------------------------
|
||||
|
||||
@ -51,9 +51,7 @@ open class HeaderView: Container {
|
||||
open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
|
||||
super.set(with: model, delegateObject, additionalData)
|
||||
guard let headerModel = headerModel else { return }
|
||||
if let lineModel = headerModel.line {
|
||||
line.set(with: lineModel, delegateObject, additionalData)
|
||||
}
|
||||
line.setOptional(with: headerModel.line, delegateObject, additionalData)
|
||||
}
|
||||
|
||||
open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
|
||||
|
||||
@ -30,9 +30,6 @@
|
||||
if bottomPadding == nil {
|
||||
bottomPadding = PaddingDefaultVerticalSpacing
|
||||
}
|
||||
if line == nil {
|
||||
line = LineModel(type: .heavy)
|
||||
}
|
||||
}
|
||||
|
||||
public override init() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user