Merge pull request #162 from mattjgalloway/FixHighlightMultipleLines

Fix where the highlight is made if it spans multiple lines

Author: AliSoftware

OHAttributedLabel/Source/OHAttributedLabel.m

@@ -666,16 +666,15 @@ -(void)drawActiveLinkHighlightForRect:(CGRect)rect
 				continue; // with next run
 			}
 
-            // Fix for issue #136
             CFRange fullRunRange = CTRunGetStringRange(run);
+
+            CFIndex startActiveLinkInRun = (CFIndex)activeLinkRange.location - fullRunRange.location;
+            CFIndex endActiveLinkInRun = startActiveLinkInRun + (CFIndex)activeLinkRange.length;
+            
             CFRange inRunRange;
-            inRunRange.location = (CFIndex)activeLinkRange.location - (CFIndex)fullRunRange.location;
-            inRunRange.length = (CFIndex)activeLinkRange.length;
-            if (inRunRange.location < 0) {
-                inRunRange.length += inRunRange.location;
-                inRunRange.location = 0;
-            }
-            // End Fix #136
+            inRunRange.location = MAX(startActiveLinkInRun, 0);
+            inRunRange.length = MIN(endActiveLinkInRun, fullRunRange.length);
+            
             CGRect linkRunRect = CTRunGetTypographicBoundsForRangeAsRect(run, line, lineOrigins[lineIndex], inRunRange, ctx);
 
 			linkRunRect = CGRectIntegral(linkRunRect);		// putting the rect on pixel edges