Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correcting location when tapping on the label #39

Merged
merged 2 commits into from
Jan 5, 2016
Merged

Correcting location when tapping on the label #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6a9be4
Correcting location CGPoint manually by substracting thr heightDiff
Jan 4, 2016
6316452
Clean Up
Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions ActiveLabel/ActiveLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ public protocol ActiveLabelDelegate: class {
private var urlTapHandler: ((NSURL) -> ())?

private var selectedElement: (range: NSRange, element: ActiveElement)?
private var heightCorrection: CGFloat = 0
private lazy var textStorage = NSTextStorage()
private lazy var layoutManager = NSLayoutManager()
private lazy var textContainer = NSTextContainer()
Expand Down Expand Up @@ -234,8 +235,8 @@ public protocol ActiveLabelDelegate: class {

private func textOrigin(inRect rect: CGRect) -> CGPoint {
let usedRect = layoutManager.usedRectForTextContainer(textContainer)
let heightDiff = rect.height - usedRect.height
let glyphOriginY = heightDiff > 0 ? rect.origin.y + heightDiff/2 : rect.origin.y
heightCorrection = (rect.height - usedRect.height)/2
let glyphOriginY = heightCorrection > 0 ? rect.origin.y + heightCorrection : rect.origin.y
return CGPoint(x: rect.origin.x, y: glyphOriginY)
}

Expand Down Expand Up @@ -347,13 +348,15 @@ public protocol ActiveLabelDelegate: class {
guard textStorage.length > 0 else {
return nil
}


var correctLocation = location
correctLocation.y -= heightCorrection
let boundingRect = layoutManager.boundingRectForGlyphRange(NSRange(location: 0, length: textStorage.length), inTextContainer: textContainer)
guard boundingRect.contains(location) else {
guard boundingRect.contains(correctLocation) else {
return nil
}

let index = layoutManager.glyphIndexForPoint(location, inTextContainer: textContainer)
let index = layoutManager.glyphIndexForPoint(correctLocation, inTextContainer: textContainer)

for element in activeElements.map({ $0.1 }).flatten() {
if index >= element.range.location && index <= element.range.location + element.range.length {
Expand Down