github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Move border drawing to OakDocumentView

Browse Source 
Drawing the border did not account for auxiliary views (presently used by incremental search). See issue #240.

It also did not properly layout the views when adding/removing such views, causing the border to disappear after having used incremental search.
This commit is contained in:
Allan Odgaard
2012-08-22 14:28:52 +02:00
parent d629f6cbe3
commit 7b4bf9c893
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Frameworks/OakTextView/src/OakDocumentView.mm
View File

@@ -89,7 +89,7 @@ private:
CGFloat gutterViewWidth = 40;
NSRect textScrollViewFrame = NSMakeRect(gutterViewWidth+1, OakStatusBarHeight, NSWidth(aRect)-gutterViewWidth-1, NSHeight(aRect)-OakStatusBarHeight);
NSRect textScrollViewFrame = NSMakeRect(gutterViewWidth, OakStatusBarHeight, NSWidth(aRect)-gutterViewWidth, NSHeight(aRect)-OakStatusBarHeight);
NSSize textViewSize = [NSScrollView contentSizeForFrameSize:textScrollViewFrame.size hasHorizontalScroller:YES hasVerticalScroller:YES borderType:NSNoBorder];
textScrollView = [[NSScrollView alloc] initWithFrame:textScrollViewFrame];
@@ -104,7 +104,7 @@ private:
[self addSubview:textScrollView];
NSRect gutterScrollViewFrame = NSMakeRect(0, OakStatusBarHeight, gutterViewWidth, NSHeight(aRect)-OakStatusBarHeight);
NSRect gutterScrollViewFrame = NSMakeRect(0, OakStatusBarHeight, gutterViewWidth - 1, NSHeight(aRect)-OakStatusBarHeight);
NSSize gutterViewSize = [NSScrollView contentSizeForFrameSize:gutterScrollViewFrame.size hasHorizontalScroller:NO hasVerticalScroller:NO borderType:NSNoBorder];
gutterView = [[GutterView alloc] initWithFrame:NSMakeRect(0, 0, gutterViewSize.width, gutterViewSize.height)];
@@ -333,7 +333,7 @@ private:
CGFloat totalHeight = NSHeight(self.frame);
CGFloat docHeight = totalHeight - NSHeight(statusBar.frame) - topHeight - bottomHeight;
CGFloat gutterWidth = NSWidth(gutterScrollView.frame);
CGFloat gutterWidth = NSWidth(gutterScrollView.frame) + 1;
CGFloat y = NSHeight(statusBar.frame);
for(NSView* view in bottomAuxiliaryViews)
@@ -342,7 +342,7 @@ private:
y += NSHeight(view.frame);
}
[gutterScrollView setFrame:NSMakeRect(0, y, gutterWidth, docHeight)];
[gutterScrollView setFrame:NSMakeRect(0, y, gutterWidth - 1, docHeight)];
[textScrollView setFrame:NSMakeRect(gutterWidth, y, NSWidth(textScrollView.frame), docHeight)];
y += docHeight;
@@ -401,11 +401,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
[gutterDividerColor set];
NSRect gutterFrame = gutterView.frame;
NSRectFill(NSMakeRect(NSMaxX(gutterFrame), OakStatusBarHeight, 1, NSHeight(self.frame)-OakStatusBarHeight));
NSRect gutterFrame = gutterScrollView.frame;
NSRectFill(NSMakeRect(NSMaxX(gutterFrame), NSMinY(gutterFrame), 1, NSHeight(gutterFrame)));
}
// ======================