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

Restyle navigation bar to be more in line with Lion.

Browse Source 
- The shading is a combination of the scope bar and textured button used in Lion/Mountain Lion.
- Add an inactive state.
- Increase click area of the forward/back buttons while decreasing the image size.
- Switch popup menu cell to NSBackgroundStyleLight, previously the text would go to gray when inactive this prevents that though it does lose the drop shadow.
- Various tweaks to alignment and spacing.
This commit is contained in:
Michael Sheets
2013-01-20 23:10:32 -06:00
parent 4ad6dc99a9
commit 6970031245
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Frameworks/OakFileBrowser/src/OakFileBrowser.mm
View File

@@ -141,14 +141,8 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
_headerView.goForwardButton.target = self;
_headerView.goForwardButton.action = @selector(goForward:);
NSBox* bottomDividerView = [[NSBox alloc] initWithFrame:NSZeroRect];
bottomDividerView.boxType = NSBoxCustom;
bottomDividerView.borderType = NSLineBorder;
bottomDividerView.borderColor = [NSColor blackColor];
_view = [NSView new];
[_view addSubview:_headerView];
[_view addSubview:bottomDividerView];
[_view addSubview:scrollView];
NSCell* cell = [OFBPathInfoCell new];
@@ -167,15 +161,14 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
NSDictionary* views = @{
@"parent" : _view,
@"header" : _headerView,
@"divider" : bottomDividerView,
@"browser" : scrollView,
};
for(NSView* view in [views allValues])
[view setTranslatesAutoresizingMaskIntoConstraints:NO];
[_view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[header(==browser,==divider)]|" options:0 metrics:nil views:views]];
[_view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[header][divider(==1)][browser]|" options:0 metrics:nil views:views]];
[_view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[header(==browser)]|" options:0 metrics:nil views:views]];
[_view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[header][browser]|" options:0 metrics:nil views:views]];
}
- (void)setupViewWithState:(NSDictionary*)fileBrowserState

48
Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
View File

@@ -11,7 +11,7 @@ static NSButton* ImageButton (NSString* imageName)
[res setBordered:NO];
NSImage* image = [[NSImage imageNamed:imageName] copy];
[image setSize:NSMakeSize(13, 13)];
[image setSize:NSMakeSize(9, 9)];
[res setImage:image];
[res setImagePosition:NSImageOnly];
@@ -21,13 +21,17 @@ static NSButton* ImageButton (NSString* imageName)
static NSPopUpButton* PopUpButton ()
{
NSPopUpButton* res = [NSPopUpButton new];
[[res cell] setBackgroundStyle:NSBackgroundStyleRaised];
[[res cell] setBackgroundStyle:NSBackgroundStyleLight];
[res setContentCompressionResistancePriority:NSLayoutPriorityDefaultLow forOrientation:NSLayoutConstraintOrientationHorizontal];
[res setBordered:NO];
return res;
}
@interface OFBHeaderView ()
@property (nonatomic) BOOL renderEnabled;
@property (nonatomic) NSBox* lightDividerView;
@property (nonatomic) NSBox* darkDividerView;
@property (nonatomic) NSBox* bottomDividerView;
@end
@implementation OFBHeaderView
@@ -41,12 +45,17 @@ static NSPopUpButton* PopUpButton ()
self.goForwardButton = ImageButton(NSImageNameGoRightTemplate);
self.goForwardButton.toolTip = @"Go Forward";
self.darkDividerView = OakCreateViewWithColor([NSColor colorWithCalibratedWhite:0.551 alpha:1.000]);
self.lightDividerView = OakCreateViewWithColor([NSColor colorWithCalibratedWhite:0.869 alpha:1.000]);
self.bottomDividerView = OakCreateViewWithColor([NSColor colorWithCalibratedWhite:0.750 alpha:1.000]);
NSDictionary* views = @{
@"folder" : self.folderPopUpButton,
@"shadow" : OakCreateViewWithColor([NSColor grayColor]),
@"divider" : OakCreateViewWithColor([NSColor lightGrayColor]),
@"shadow" : self.darkDividerView,
@"divider" : self.lightDividerView,
@"back" : self.goBackButton,
@"forward" : self.goForwardButton,
@"bottom" : self.bottomDividerView,
};
for(NSView* view in [views allValues])
@@ -55,12 +64,13 @@ static NSPopUpButton* PopUpButton ()
[self addSubview:view];
}
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(1)-[folder(>=75)]-(3)-[shadow(==1)][divider(==1)]-(9)-[back(==11)]-(9)-[forward(==back)]-(9)-|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(2)-[folder]" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[shadow]|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[divider]|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(0)-[back(==22)]-(2)-|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(0)-[forward(==back)]" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(-3)-[folder(>=75)]-(3)-[shadow(==1)][divider(==1)]-(2)-[back(==22)]-(2)-[forward(==back)]-(3)-|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[bottom]|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(-1)-[folder(==26)]-(0)-|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[shadow][bottom(==1)]|" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[divider(==shadow)]" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(-1)-[back(==25)]" options:0 metrics:nil views:views]];
[self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(-1)-[forward(==back)]" options:0 metrics:nil views:views]];
}
return self;
}
@@ -105,14 +115,28 @@ static NSPopUpButton* PopUpButton ()
if(_renderEnabled != flag)
{
_renderEnabled = flag;
if(flag)
{
self.darkDividerView.borderColor = [NSColor colorWithCalibratedWhite:0.551 alpha:1.000];
self.lightDividerView.borderColor = [NSColor colorWithCalibratedWhite:0.869 alpha:1.000];
self.bottomDividerView.borderColor = [NSColor colorWithCalibratedWhite:0.500 alpha:1.000];
}
else
{
self.darkDividerView.borderColor = [NSColor colorWithCalibratedWhite:0.801 alpha:1.000];
self.lightDividerView.borderColor = [NSColor colorWithCalibratedWhite:0.869 alpha:0.000];
self.bottomDividerView.borderColor = [NSColor colorWithCalibratedWhite:0.750 alpha:1.000];
}
[self setNeedsDisplay:YES];
}
}
- (void)drawRect:(NSRect)aRect
{
NSColor* topColor = self.renderEnabled ? [NSColor lightGrayColor] : [NSColor lightGrayColor];
NSColor* bottomColor = self.renderEnabled ? [NSColor grayColor] : [NSColor lightGrayColor];
NSColor* topColor = self.renderEnabled ? [NSColor colorWithCalibratedWhite:0.915 alpha:1.000] : [NSColor colorWithCalibratedWhite:0.915 alpha:1.000];
NSColor* bottomColor = self.renderEnabled ? [NSColor colorWithCalibratedWhite:0.760 alpha:1.000] : [NSColor colorWithCalibratedWhite:0.915 alpha:1.000];
[[[NSGradient alloc] initWithStartingColor:bottomColor endingColor:topColor] drawInRect:self.bounds angle:90];
}
@end