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

copy from Kevin's commit: aac5093c37

Browse Source
This commit is contained in:
panxi 2019-04-26 13:41:54 -04:00
parent d380328913
commit 2f0a727d03
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atoms/Buttons/CaretButton.swift
View File

@ -13,8 +13,8 @@ open class CaretButton: MFCustomButton {
// MARK: - Constants // MARK: - Constants
//------------------------------------------------------ //------------------------------------------------------
private let CARET_VIEW_HEIGHT: Float = 10.8 private let CARET_VIEW_HEIGHT: Float = 10.5
private let CARET_VIEW_WIDTH: Float = 6.6 private let CARET_VIEW_WIDTH: Float = 6.5
//------------------------------------------------------ //------------------------------------------------------

13
MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
View File

@ -74,9 +74,16 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
public var actionText: String? public var actionText: String?
public var backText: String? public var backText: String?
private var text: String? { private var internalText: String = ""
willSet(newText) {
attributedText = NSAttributedString(string: newText ?? "") public var text: String? {
get {
return internalText
}
set {
guard let text = newValue else { return }
internalText = text
attributedText = NSAttributedString(string: text)
setAlternateNormalTextAttributes([NSAttributedString.Key.font: normalTextFont as Any]) setAlternateNormalTextAttributes([NSAttributedString.Key.font: normalTextFont as Any])
setAlternateActionTextAttributes([NSAttributedString.Key.font: actionTextFont as Any]) setAlternateActionTextAttributes([NSAttributedString.Key.font: actionTextFont as Any])
setAlternateNormalTextAttributes([NSAttributedString.Key.foregroundColor: normalTextColor as Any]) setAlternateNormalTextAttributes([NSAttributedString.Key.foregroundColor: normalTextColor as Any])