mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
panxi 2019-11-26 13:57:24 -05:00
parent 1a5c819a2a
commit 269898f566
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MVMCoreUI/Atoms/Views/CaretView.swift
View File

@ -124,18 +124,8 @@ open class CaretView: View {
lineWidth = lineWidthValue
}
}
}
extension CaretView: MVMCoreUIViewConstrainingProtocol {
open func needsToBeConstrained() -> Bool {
return true
}
open func alignment() -> UIStackView.Alignment {
return UIStackView.Alignment.leading;
}
public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
override public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
guard let caretModel = model as? CaretViewModel else {
return
}
@ -156,3 +146,15 @@ extension CaretView: MVMCoreUIViewConstrainingProtocol {
}
}
}
extension CaretView: MVMCoreUIViewConstrainingProtocol {
open func needsToBeConstrained() -> Bool {
return true
}
open func alignment() -> UIStackView.Alignment {
return UIStackView.Alignment.leading;
}
}

2
MVMCoreUI/Atoms/Views/DashLine.swift
View File

@ -84,7 +84,7 @@ open class DashLine: View {
}
}
public func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
public override func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [String : AnyHashable]?) {
guard let dashLineModel = model as? DashLineModel else {
return
}