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

Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding

Browse Source
This commit is contained in:
Xinlei(Ryan) Pan 2020-01-24 09:26:00 -05:00
commit 6602ac505a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,6 @@ open class DashLine: View {
get { return model as? DashLineModel } get { return model as? DashLineModel }
} }
// Legacy
@objc public var dashColor: UIColor?
@objc private var dashLayer: CAShapeLayer? @objc private var dashLayer: CAShapeLayer?
//------------------------------------------------------ //------------------------------------------------------
@ -70,7 +68,7 @@ open class DashLine: View {
dashLayer.lineCap = .round dashLayer.lineCap = .round
dashLayer.lineDashPattern = [NSNumber(value: 2), NSNumber(value: 2)] dashLayer.lineDashPattern = [NSNumber(value: 2), NSNumber(value: 2)]
dashLayer.path = path.cgPath dashLayer.path = path.cgPath
dashLayer.strokeColor = dashModel?.dashColor.uiColor.cgColor ?? dashColor?.cgColor ?? UIColor.mfLighterGray().cgColor dashLayer.strokeColor = dashModel?.dashColor.cgColor
dashLayer.fillColor = UIColor.clear.cgColor dashLayer.fillColor = UIColor.clear.cgColor
dashLayer.backgroundColor = backgroundColor?.cgColor ?? UIColor.white.cgColor dashLayer.backgroundColor = backgroundColor?.cgColor ?? UIColor.white.cgColor
self.dashLayer = dashLayer self.dashLayer = dashLayer
@ -81,7 +79,7 @@ open class DashLine: View {
//------------------------------------------------------ //------------------------------------------------------
// Default values for view. // Default values for view.
@objc open override func setAsMolecule() { @objc open override func reset() {
backgroundColor = .clear backgroundColor = .clear
isHidden = false isHidden = false
} }