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

Small changes.

Browse Source
This commit is contained in:
Christiano, Kevin 2019-05-01 16:30:24 -04:00
parent 2ec2c2b0b8
commit 9c6ddc2470
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,6 @@ public typealias ActionBlock = () -> Void
label.addGestureRecognizer(tapGesture) label.addGestureRecognizer(tapGesture)
} }
} }
default: default:
continue continue
} }
@ -363,8 +362,8 @@ extension Label {
@objc func textLinkTapped(_ gesture: UITapGestureRecognizer) { @objc func textLinkTapped(_ gesture: UITapGestureRecognizer) {
for clause in clauses { for clause in clauses {
if gesture.didTapAttributedTextInLabel(self, inRange: clause.range), let action = clause.actionBlock { if gesture.didTapAttributedTextInLabel(self, inRange: clause.range) {
action() clause.performAction()
} }
} }
} }
@ -435,7 +434,6 @@ extension Label {
} }
} }
extension UITapGestureRecognizer { extension UITapGestureRecognizer {
func didTapAttributedTextInLabel(_ label: Label, inRange targetRange: NSRange) -> Bool { func didTapAttributedTextInLabel(_ label: Label, inRange targetRange: NSRange) -> Bool {
@ -453,13 +451,6 @@ extension UITapGestureRecognizer {
let labelSize = label.bounds.size let labelSize = label.bounds.size
textContainer.size = labelSize textContainer.size = labelSize
// Find the tapped character location and compare it to the specified range
// let locationOfTouchInLabel = location(in: label)
// let textBoundingBox = layoutManager.usedRect(for: textContainer)
// let textContainerOffset = CGPoint(x: (labelSize.width - textBoundingBox.size.width) * 0.5 - textBoundingBox.origin.x,
// y: (labelSize.height - textBoundingBox.size.height) * 0.5 - textBoundingBox.origin.y)
// let locationOfTouchInTextContainer = CGPoint(x: locationOfTouchInLabel.x - textContainerOffset.x,
// y: locationOfTouchInLabel.y - textContainerOffset.y)
let indexOfCharacter = layoutManager.characterIndex(for: location(in: label), in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil) let indexOfCharacter = layoutManager.characterIndex(for: location(in: label), in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
return NSLocationInRange(indexOfCharacter, targetRange) return NSLocationInRange(indexOfCharacter, targetRange)

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

@ -213,8 +213,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
actionBlock = { [weak self, weak delegateObject] in actionBlock = { [weak self, weak delegateObject] in
var performAction = true var performAction = true
if let wSelf = self, if let wSelf = self, let wButtonDelegate = (delegateObject as? MVMCoreUIDelegateObject)?.buttonDelegate,
let wButtonDelegate = (delegateObject as? MVMCoreUIDelegateObject)?.buttonDelegate,
wButtonDelegate.responds(to: #selector(ButtonObjectDelegate.button(_:shouldPerformActionWithMap:additionalData:))) { wButtonDelegate.responds(to: #selector(ButtonObjectDelegate.button(_:shouldPerformActionWithMap:additionalData:))) {
performAction = wButtonDelegate.button?(wSelf, shouldPerformActionWithMap: actionMap, additionalData: additionalData) ?? false performAction = wButtonDelegate.button?(wSelf, shouldPerformActionWithMap: actionMap, additionalData: additionalData) ?? false
} }