Commit: 6e70305c5d7f1d9a11f5583b4a19cdc1987a161c - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 6e70305c5d7f1d9a11f5583b4a19cdc1987a161c (tree)
• Zeit: 2012-08-19 04:28:56
• Autor: jtbandes <jtbandes@gmai...>
• Commiter: Allan Odgaard

Log Message

Move border drawing to OakDocumentView

This allows the border to appear properly when scrolling (with a multitouch device) bounces past the end of the content.

Ändern Zusammenfassung

• modified: Frameworks/OakTextView/src/GutterView.mm
• modified: Frameworks/OakTextView/src/OakDocumentView.mm

Diff

--- a/Frameworks/OakTextView/src/GutterView.mm
+++ b/Frameworks/OakTextView/src/GutterView.mm
@@ -332,20 +332,17 @@ static void DrawText (std::string const& text, CGRect const& rect, CGFloat basel
 - (void)drawRect:(NSRect)aRect
 {
 	[self.enclosingScrollView.backgroundColor set];
-	NSRectFill(NSIntersectionRect(aRect, NSOffsetRect(self.frame, -1, 0)));
-
-	[[NSColor grayColor] set];
-	NSRectFill(NSIntersectionRect(aRect, NSOffsetRect(self.frame, NSWidth(self.frame)-1, 0)));
+	NSRectFill(NSIntersectionRect(aRect, self.frame));
 
 	[self setupSelectionRects];
 
 	[[self.enclosingScrollView.backgroundColor highlightWithLevel:0.5] set];
 	iterate(rect, backgroundRects)
-		NSRectFill(NSIntersectionRect(*rect, NSIntersectionRect(aRect, NSOffsetRect(self.frame, -1, 0))));
+		NSRectFill(NSIntersectionRect(*rect, NSIntersectionRect(aRect, self.frame)));
 
 	[[NSColor grayColor] set];
 	iterate(rect, borderRects)
-		NSRectFill(NSIntersectionRect(*rect, NSIntersectionRect(aRect, NSOffsetRect(self.frame, -1, 0))));
+		NSRectFill(NSIntersectionRect(*rect, NSIntersectionRect(aRect, self.frame)));
 
 	std::pair<NSUInteger, NSUInteger> prevLine(NSNotFound, 0);
 	for(CGFloat y = NSMinY(aRect); y < NSMaxY(aRect); )
@@ -387,7 +384,7 @@ static void DrawText (std::string const& text, CGRect const& rect, CGFloat basel
 
 	static const CGFloat columnPadding = 1;
 
-	CGFloat currentX = 0, totalWidth = 1; // we start at 1 to account for the right border
+	CGFloat currentX = 0, totalWidth = 0;
 	iterate(it, columnDataSources)
 	{
 		it->x0 = currentX;

--- a/Frameworks/OakTextView/src/OakDocumentView.mm
+++ b/Frameworks/OakTextView/src/OakDocumentView.mm
@@ -86,7 +86,7 @@ private:
 
 		CGFloat gutterViewWidth = 40;
 
-		NSRect textScrollViewFrame = NSMakeRect(gutterViewWidth, OakStatusBarHeight, NSWidth(aRect)-gutterViewWidth, NSHeight(aRect)-OakStatusBarHeight);
+		NSRect textScrollViewFrame = NSMakeRect(gutterViewWidth+1, OakStatusBarHeight, NSWidth(aRect)-gutterViewWidth-1, NSHeight(aRect)-OakStatusBarHeight);
 		NSSize textViewSize = [NSScrollView contentSizeForFrameSize:textScrollViewFrame.size hasHorizontalScroller:YES hasVerticalScroller:YES borderType:NSNoBorder];
 
 		textScrollView = [[NSScrollView alloc] initWithFrame:textScrollViewFrame];
@@ -372,6 +372,11 @@ private:
 		[[NSColor grayColor] set];
 		NSRectFill(NSIntersectionRect(NSMakeRect(NSMinX(aRect), NSHeight(self.frame) - height, NSWidth(aRect), 1), aRect));
 	}
+	
+	// Draw the border between gutter and text views
+	[[NSColor grayColor] set];
+	NSRect gutterFrame = gutterView.frame;
+	NSRectFill(NSMakeRect(NSMaxX(gutterFrame), OakStatusBarHeight, 1, NSHeight(self.frame)-OakStatusBarHeight));
 }
 
 // ======================