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

Remove automatic resizing from gutter view

Browse Source 
There is a somewhat frequent crash caused by infinite “did resize” notifications. It’s unclear exactly why this happens, but basically a subview shouldn’t resize itself unless asked, and it shouldn’t resize siblings either.

We now have an explicit sizeToFit which takes care of sizing the gutter view. It is the responsibility of the owner (of this gutter view) to resize the gutter’s parent scroll view and any siblings that may need adjustment (after calling sizeToFit).

Additionally it is the responsibility of the owner to call sizeToFit when there is a chance the gutter view size needs updating. Generally though, the owner should know, as it is the data source for everything.
This commit is contained in:
Allan Odgaard
2012-08-29 21:54:24 +02:00
parent ad8977d849
commit 3d2a3b09d6
2 changed files with 3 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Frameworks/OakTextView/src/GutterView.h
View File

@@ -64,4 +64,5 @@ struct GVLineRecord
- (void)insertColumnWithIdentifier:(NSString*)columnIdentifier atPosition:(NSUInteger)index dataSource:(id <GutterViewColumnDataSource>)columnDataSource delegate:(id <GutterViewColumnDelegate>)columnDelegate;
- (void)setVisibility:(BOOL)visible forColumnWithIdentifier:(NSString*)columnIdentifier;
- (BOOL)visibilityForColumnWithIdentifier:(NSString*)identifier;
- (void)sizeToFit;
@end

48
Frameworks/OakTextView/src/GutterView.mm
View File

@@ -28,9 +28,6 @@ struct data_source_t
};
@interface GutterView ()
- (void)frameDidChange:(NSNotification*)aNotification;
- (void)updateWidthWithAnimation:(BOOL)animate;
- (void)setGutterWidth:(CGFloat)newWidth animate:(BOOL)animate;
- (CGFloat)widthForColumnWithIdentifier:(std::string const&)identifier;
- (void)clearTrackingRects;
@@ -70,11 +67,6 @@ struct data_source_t
[self setupTrackingRects];
}
- (void)viewDidMoveToSuperview
{
[self frameDidChange:nil];
}
- (void)removeFromSuperview
{
D(DBF_GutterView, bug("\n"););
@@ -160,7 +152,6 @@ struct data_source_t
{
[lineNumberFont release];
lineNumberFont = [font retain];
[self frameDidChange:nil];
}
}
@@ -175,11 +166,7 @@ struct data_source_t
}
if(partnerView = [aView retain])
{
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(frameDidChange:) name:NSViewFrameDidChangeNotification object:partnerView];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(boundsDidChange:) name:NSViewBoundsDidChangeNotification object:[[partnerView enclosingScrollView] contentView]];
[self frameDidChange:nil];
}
}
- (void)setDelegate:(id <GutterViewDelegate>)aDelegate
@@ -206,23 +193,6 @@ struct data_source_t
return YES;
}
- (void)setGutterWidth:(CGFloat)newWidth animate:(BOOL)animate
{
NSRect frame = self.frame;
CGFloat widthDifference = newWidth - frame.size.width;
frame.size.width = newWidth;
[(animate ? self.animator : self) setFrame:frame];
frame = self.enclosingScrollView.frame;
frame.size.width += widthDifference;
[(animate ? self.enclosingScrollView.animator : self.enclosingScrollView) setFrame:frame];
frame = partnerView.enclosingScrollView.frame;
frame.size.width -= widthDifference;
frame.origin.x += widthDifference;
[(animate ? partnerView.enclosingScrollView.animator : partnerView.enclosingScrollView) setFrame:frame];
}
- (BOOL)visibilityForColumnWithIdentifier:(NSString*)identifier
{
return ![hiddenColumns containsObject:identifier];
@@ -302,13 +272,6 @@ struct data_source_t
[self.enclosingScrollView.contentView scrollToPoint:NSMakePoint(0, NSMinY(partnerView.enclosingScrollView.contentView.bounds))];
}
- (void)frameDidChange:(NSNotification*)aNotification
{
[self setFrameSize:NSMakeSize(NSWidth(self.enclosingScrollView.documentVisibleRect), NSHeight(partnerView.frame) + NSHeight([self.enclosingScrollView documentVisibleRect]) - NSHeight([partnerView.enclosingScrollView documentVisibleRect]))];
[self.enclosingScrollView.contentView scrollToPoint:NSMakePoint(0, NSMinY(partnerView.enclosingScrollView.contentView.bounds))];
[self updateWidthWithAnimation:NO];
}
static CTLineRef CTCreateLineFromText (std::string const& text, NSFont* font, NSColor* color = nil)
{
return CTLineCreateWithAttributedString(ns::attr_string_t(font) << (color ?: [NSColor grayColor]) << text);
@@ -400,13 +363,8 @@ static void DrawText (std::string const& text, CGRect const& rect, CGFloat basel
}
}
- (void)updateWidthWithAnimation:(BOOL)animate
- (void)sizeToFit
{
// Don’t perform any sizing until the view is set up,
// to avoid the width becoming out of sync with the partnerView
if(!partnerView || !self.superview)
return;
static const CGFloat columnPadding = 1;
CGFloat currentX = 0, totalWidth = 0;
@@ -424,13 +382,12 @@ static void DrawText (std::string const& text, CGRect const& rect, CGFloat basel
it->width = 0;
}
}
[self setGutterWidth:totalWidth animate:animate];
[self setFrameSize:NSMakeSize(totalWidth, NSHeight([self frame]))];
}
- (void)reloadData:(id)sender
{
D(DBF_GutterView, bug("\n"););
[self updateWidthWithAnimation:NO];
[self setNeedsDisplay:YES];
}
@@ -510,7 +467,6 @@ static void DrawText (std::string const& text, CGRect const& rect, CGFloat basel
if(visible)
[hiddenColumns removeObject:columnIdentifier];
else [hiddenColumns addObject:columnIdentifier];
[self updateWidthWithAnimation:NO];
}
// ==================