Merge pull request #358 from migrant/master

NIAttributedLabel
jverkoey · Mar 26, 2013 · 16e0ecc · 16e0ecc
2 parents 92e481e + 3cbbe8a
commit 16e0ecc
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/attributedlabel/src/NIAttributedLabel.m b/src/attributedlabel/src/NIAttributedLabel.m
@@ -788,9 +788,20 @@ - (NSTextCheckingResult *)linkAtPoint:(CGPoint)point {
       CGPoint relativePoint = CGPointMake(point.x-CGRectGetMinX(rect),
                                           point.y-CGRectGetMinY(rect));
       CFIndex idx = CTLineGetStringIndexForPosition(line, relativePoint);
-      foundLink = [self linkAtIndex:idx];
+
+      NSUInteger offset = 0;
+      for (NIAttributedLabelImage *labelImage in self.images) {
+        if (labelImage.index < idx) {
+          offset++;
+        }
+
+      }
+
+      foundLink = [self linkAtIndex:idx - offset];;
       if (foundLink) {
-        return foundLink;
+        NSTextCheckingResult *result = [NSTextCheckingResult linkCheckingResultWithRange:NSMakeRange(foundLink.range.location + offset, foundLink.range.length) URL:foundLink.URL];
+
+        return result;
       }
     }
   }