use setNeedsDisplayInRect: when drawing the selection

twitter-archive · Jul 10, 2011 · 64d5b17 · 64d5b17
1 parent 6f1c002
commit 64d5b17
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/lib/UIKit/TUITextRenderer+Event.h b/lib/UIKit/TUITextRenderer+Event.h
@@ -20,6 +20,7 @@
 
 - (CFIndex)stringIndexForPoint:(CGPoint)p;
 - (void)resetSelection;
+- (CGRect)rectForCurrentSelection;
 
 - (void)copy:(id)sender;
 

diff --git a/lib/UIKit/TUITextRenderer+Event.m b/lib/UIKit/TUITextRenderer+Event.m
@@ -128,6 +128,8 @@ - (BOOL)beginWaitForDragInRange:(NSRange)range string:(NSString *)string
 
 - (void)mouseDown:(NSEvent *)event
 {
+	CGRect previousSelectionRect = [self rectForCurrentSelection];
+
 	switch([event clickCount]) {
 		case 4:
 			_selectionAffinity = TUITextSelectionAffinityParagraph;
@@ -180,13 +182,16 @@ - (void)mouseDown:(NSEvent *)event
 		self.hitRange = hitActiveRange;
 	}
 
-	[view setNeedsDisplay];
+	CGRect totalRect = CGRectUnion(previousSelectionRect, [self rectForCurrentSelection]);
+	[view setNeedsDisplayInRect:totalRect];
 	if([self acceptsFirstResponder])
 		[[view nsWindow] tui_makeFirstResponder:self];
 }
 
 - (void)mouseUp:(NSEvent *)event
 {
+	CGRect previousSelectionRect = [self rectForCurrentSelection];
+
 	CFIndex i = [self stringIndexForEvent:event];
 	_selectionEnd = i;
 
@@ -204,14 +209,43 @@ - (void)mouseUp:(NSEvent *)event
 
 	_selectionAffinity = TUITextSelectionAffinityCharacter; // reset affinity
 
-	[view setNeedsDisplay];
+	CGRect totalRect = CGRectUnion(previousSelectionRect, [self rectForCurrentSelection]);
+	[view setNeedsDisplayInRect:totalRect];
 }
 
 - (void)mouseDragged:(NSEvent *)event
 {
+	CGRect previousSelectionRect = [self rectForCurrentSelection];
+
 	CFIndex i = [self stringIndexForEvent:event];
 	_selectionEnd = i;
-	[view setNeedsDisplay];
+
+	CGRect totalRect = CGRectUnion(previousSelectionRect, [self rectForCurrentSelection]);
+	[view setNeedsDisplayInRect:totalRect];
+}
+
+- (CGRect)rectForCurrentSelection {
+	CTFrameRef textFrame = [self ctFrame];
+	CGRect totalRect = CGRectNull;
+	CFRange selectedRange = [self _selectedRange];
+	if(selectedRange.length > 0) {
+		CFIndex rectCount = 100;
+		CGRect rects[rectCount];
+		AB_CTFrameGetRectsForRange(textFrame, selectedRange, rects, &rectCount);
+
+		for(CFIndex i = 0; i < rectCount; ++i) {
+			CGRect rect = rects[i];
+			rect = CGRectIntegral(rect);
+
+			if(CGRectEqualToRect(totalRect, CGRectNull)) {
+				totalRect = rect;
+			} else {
+				totalRect = CGRectUnion(rect, totalRect);
+			}
+		}
+	}
+
+	return totalRect;
 }
 
 - (void)resetSelection