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

Align close button (×) with file labels

Browse Source 
Closes #391.
This commit is contained in:
Allan Odgaard
2013-02-11 14:21:21 +01:00
parent 099fbdf042
commit df8465e607
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Frameworks/OakFileBrowser/src/ui/OFBPathInfoCell.mm
View File

@@ -5,6 +5,8 @@
#import <OakFoundation/OakTimer.h>
#import <oak/debug.h>
static CGFloat kCloseButtonRightMargin = 5;
static void DrawSpinner (NSRect cellFrame, BOOL isFlipped, NSColor* color, double value)
{
static const CGFloat deg2rad = 0.017453292519943295;
@@ -77,7 +79,7 @@ static void DrawSpinner (NSRect cellFrame, BOOL isFlipped, NSColor* color, doubl
{
if(!self.isOpen)
return NSZeroRect;
return NSMakeRect(NSMaxX(cellFrame) - self.closeIcon.size.width, NSMaxY(cellFrame) - (cellFrame.size.height + self.closeIcon.size.height) / 2, self.closeIcon.size.width, self.closeIcon.size.height);
return NSMakeRect(NSMaxX(cellFrame) - kCloseButtonRightMargin - self.closeIcon.size.width, NSMaxY(cellFrame) - (cellFrame.size.height + self.closeIcon.size.height) / 2, self.closeIcon.size.width, self.closeIcon.size.height);
}
- (void)redrawFrame:(OakTimer*)timer
@@ -130,8 +132,10 @@ static void DrawSpinner (NSRect cellFrame, BOOL isFlipped, NSColor* color, doubl
closeIcon = [NSImage imageNamed:@"CloseFilePressed" inSameBundleAsClass:[OFBPathInfoCell class]];
else if([self isMouseInCloseButtonInFrame:cellFrame controlView:controlView] && [[controlView window] isKeyWindow])
closeIcon = [NSImage imageNamed:@"CloseFileOver" inSameBundleAsClass:[OFBPathInfoCell class]];
[closeIcon drawInRect:[self closeButtonRectInFrame:cellFrame] fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1];
cellFrame.size.width -= self.closeIcon.size.width;
NSRect closeButtonRect = [self closeButtonRectInFrame:cellFrame];
[closeIcon drawInRect:closeButtonRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1];
cellFrame.size.width -= NSMaxX(cellFrame) - NSMinX(closeButtonRect);
}
NSFont* unboldFont = self.font;