github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-21 04:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Auto-layout: Encapsulate tab bar expansion

Browse Source 
With auto-layout the tab bar view can simply invalidate its intrinsic size when it should expand/collapse. This is also done if the global user setting for disabling tab bar collapsing is changed.
This commit is contained in:
Allan Odgaard
2012-09-14 23:22:57 +02:00
parent e721e6e0d6
commit 926dfeb2a5
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Frameworks/OakAppKit/src/OakTabBarView.mm
View File

@@ -325,6 +325,7 @@ static id SafeObjectAtIndex (NSArray* array, NSUInteger index)
tabModifiedStates = [NSMutableArray new];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(viewFrameChanged:) name:NSViewFrameDidChangeNotification object:self];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(userDefaultsDidChange:) name:NSUserDefaultsDidChangeNotification object:[NSUserDefaults standardUserDefaults]];
[self registerForDraggedTypes:@[ OakTabBarViewTabType ]];
}
return self;
@@ -334,7 +335,7 @@ static id SafeObjectAtIndex (NSArray* array, NSUInteger index)
{
self.slideAroundAnimationTimer = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSViewFrameDidChangeNotification object:self];
[[NSNotificationCenter defaultCenter] removeObserver:self];
iterate(it, bindings)
{
@@ -348,6 +349,11 @@ static id SafeObjectAtIndex (NSArray* array, NSUInteger index)
[super dealloc];
}
- (void)userDefaultsDidChange:(NSNotification*)aNotification
{
self.isExpanded = [[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableTabBarCollapsingKey] ? YES : [tabTitles count] > 1;
}
- (void)viewDidMoveToWindow
{
self.layoutNeedsUpdate = YES;
@@ -489,26 +495,9 @@ static id SafeObjectAtIndex (NSArray* array, NSUInteger index)
if(isExpanded == flag)
return;
CGFloat delta = isExpanded ? 1-NSHeight(self.frame) : 23-NSHeight(self.frame);
isExpanded = flag;
BOOL visible = NO/*[[self window] isVisible]*/;
for(NSView* view in [[self superview] subviews])
{
D(DBF_TabBarView, bug("%s: %s\n", view.description.UTF8String, NSStringFromRect(view.frame).UTF8String););
NSRect frame = view.frame;
if(view == self)
{
frame.origin.y -= delta;
frame.size.height += delta;
}
else
{
frame.size.height -= delta;
}
[(visible ? [view animator] : view) setFrame:frame];
}
self.layoutNeedsUpdate = YES;
[self invalidateIntrinsicContentSize];
}
- (void)selectTab:(id)sender