Fix accessibilityElement frame to account for layoutMargins.top (bug introduced with intrinsicContentSize fix)

ndbroadbent · ndbroadbent · commit c4aaad7d0d0a · 2016-05-04T05:08:35.000+07:00
diff --git a/ActiveLabel/ActiveLabel.swift b/ActiveLabel/ActiveLabel.swift
@@ -314,7 +314,8 @@ public protocol ActiveLabelDelegate: class {
     private func accessibilityFrameForTextRange(range: NSRange) -> CGRect {
         var glyphRange = NSRange()
         layoutManager.characterRangeForGlyphRange(range, actualGlyphRange: &glyphRange)
-        let boundingRect = layoutManager.boundingRectForGlyphRange(glyphRange, inTextContainer: textContainer)
+        var boundingRect = layoutManager.boundingRectForGlyphRange(glyphRange, inTextContainer: textContainer)
+        boundingRect.origin.y += layoutMargins.top
         return UIAccessibilityConvertFrameToScreenCoordinates(boundingRect, self)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,8 @@ public protocol ActiveLabelDelegate: class {`
`314`	`314`	`private func accessibilityFrameForTextRange(range: NSRange) -> CGRect {`
`315`	`315`	`var glyphRange = NSRange()`
`316`	`316`	`layoutManager.characterRangeForGlyphRange(range, actualGlyphRange: &glyphRange)`
`317`		`- let boundingRect = layoutManager.boundingRectForGlyphRange(glyphRange, inTextContainer: textContainer)`
	`317`	`+ var boundingRect = layoutManager.boundingRectForGlyphRange(glyphRange, inTextContainer: textContainer)`
	`318`	`+ boundingRect.origin.y += layoutMargins.top`
`318`	`319`	`return UIAccessibilityConvertFrameToScreenCoordinates(boundingRect, self)`
`319`	`320`	`}`
`320`	`321`