- (void)awakeFromNib
{
[self setAutoresizesSubviews: YES];
- [self setImagesLeft:[NSImage imageNamed:@"topbar-dark-left"] middle: [NSImage imageNamed:@"topbar-dark-center-fill"] right:[NSImage imageNamed:@"topbar-dark-right"]];
+ [self setImagesLeft:imageFromRes(@"topbar-dark-left") middle: imageFromRes(@"topbar-dark-center-fill") right:imageFromRes(@"topbar-dark-right")];
[self loadButtonIcons];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(controlTintChanged:) name: NSControlTintDidChangeNotification object: nil];
-
- [o_red_btn setImage: o_red_img];
- [o_red_btn setAlternateImage: o_red_on_img];
- [[o_red_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
- [[o_red_btn cell] setTag: 0];
- [o_yellow_btn setImage: o_yellow_img];
- [o_yellow_btn setAlternateImage: o_yellow_on_img];
- [[o_yellow_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
- [[o_yellow_btn cell] setTag: 1];
- [o_green_btn setImage: o_green_img];
- [o_green_btn setAlternateImage: o_green_on_img];
- [[o_green_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
- [[o_green_btn cell] setTag: 2];
- [o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen"]];
- [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"window-fullscreen-on"]];
- [[o_fullscreen_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
- [[o_fullscreen_btn cell] setTag: 3];
}
- (void)controlTintChanged:(NSNotification *)notification
- (void)loadButtonIcons
{
- if (OSX_LION)
- {
- if( [NSColor currentControlTint] == NSBlueControlTint )
+ if (!OSX_SNOW_LEOPARD) {
+ if ([NSColor currentControlTint] == NSBlueControlTint)
{
o_red_img = [[NSImage imageNamed:@"lion-window-close"] retain];
o_red_over_img = [[NSImage imageNamed:@"lion-window-close-over"] retain];
o_green_on_img = [[NSImage imageNamed:@"lion-window-zoom-on-graphite"] retain];
}
} else {
- if( [NSColor currentControlTint] == NSBlueControlTint )
+ if ([NSColor currentControlTint] == NSBlueControlTint)
{
o_red_img = [[NSImage imageNamed:@"snowleo-window-close"] retain];
o_red_over_img = [[NSImage imageNamed:@"snowleo-window-close-over"] retain];
o_green_on_img = [[NSImage imageNamed:@"snowleo-window-zoom-on-graphite"] retain];
}
}
+
+ [o_red_btn setImage: o_red_img];
+ [o_red_btn setAlternateImage: o_red_on_img];
+ [[o_red_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
+ [[o_red_btn cell] setTag: 0];
+ [o_yellow_btn setImage: o_yellow_img];
+ [o_yellow_btn setAlternateImage: o_yellow_on_img];
+ [[o_yellow_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
+ [[o_yellow_btn cell] setTag: 1];
+ [o_green_btn setImage: o_green_img];
+ [o_green_btn setAlternateImage: o_green_on_img];
+ [[o_green_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
+ [[o_green_btn cell] setTag: 2];
+ [o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen"]];
+ [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"window-fullscreen-on"]];
+ [[o_fullscreen_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
+ [[o_fullscreen_btn cell] setTag: 3];
}
- (BOOL)mouseDownCanMoveWindow
[[self window] miniaturize: sender];
else if (sender == o_green_btn)
[[self window] performZoom: sender];
- else if (sender == o_fullscreen_btn)
- {
- // set fs directly to true, as the vars can be already true in some configs
- var_SetBool( pl_Get( VLCIntf ), "fullscreen", true );
+ else if (sender == o_fullscreen_btn) {
+ // same action as native fs button
+ [[self window] toggleFullScreen:self];
- vout_thread_t *p_vout = getVout();
- if( p_vout )
- {
- var_SetBool( p_vout, "fullscreen", true );
- vlc_object_release( p_vout );
- }
- }
- else
- msg_Err( VLCIntf, "unknown button action sender" );
+ } else
+ msg_Err(VLCIntf, "unknown button action sender");
[self setWindowButtonOver: NO];
[self setWindowFullscreenButtonOver: NO];
- (void)setWindowTitle:(NSString *)title
{
- if (!o_window_title_shadow)
- {
+ if (!o_window_title_shadow) {
o_window_title_shadow = [[NSShadow alloc] init];
[o_window_title_shadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.5]];
[o_window_title_shadow setShadowOffset:NSMakeSize(0.0, -1.5)];
- (void)setWindowButtonOver:(BOOL)b_value
{
- if( b_value )
- {
+ if (b_value) {
[o_red_btn setImage: o_red_over_img];
[o_yellow_btn setImage: o_yellow_over_img];
[o_green_btn setImage: o_green_over_img];
- }
- else
- {
+ } else {
[o_red_btn setImage: o_red_img];
[o_yellow_btn setImage: o_yellow_img];
[o_green_btn setImage: o_green_img];
[o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen"]];
}
-- (void)mouseUp:(NSEvent *)event
+- (void)mouseDown:(NSEvent *)event
{
- if ([event clickCount] == 2) {
+ NSPoint ml = [self convertPoint: [event locationInWindow] fromView: self];
+ if (([[self window] frame].size.height - ml.y) <= 22. && [event clickCount] == 2) {
//Get settings from "System Preferences" > "Appearance" > "Double-click on windows title bar to minimize"
NSString *const MDAppleMiniaturizeOnDoubleClickKey = @"AppleMiniaturizeOnDoubleClick";
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
if ([[userDefaults objectForKey:MDAppleMiniaturizeOnDoubleClickKey] boolValue])
[[self window] miniaturize:self];
}
+
+ [super mouseDown: event];
+}
+
+- (NSButton*)closeButton
+{
+ return o_red_btn;
+}
+
+- (NSButton*)minimizeButton
+{
+ return o_yellow_btn;
}
+
+- (NSButton*)zoomButton
+{
+ return o_green_btn;
+}
+
@end
/*****************************************************************************
id theControlView = [self controlView];
if ([theControlView respondsToSelector: @selector(extendedAccessibilityIsAttributeSettable:)]) {
NSNumber *theValue = [theControlView extendedAccessibilityIsAttributeSettable: theAttributeName];
- if (theValue) {
+ if (theValue)
return [theValue boolValue]; // same basic strategy we use in -accessibilityAttributeValue:
- }
}
return [super accessibilityIsAttributeSettable: theAttributeName];
}
if (windowFrame.size.width < winMinSize.width)
windowFrame.size.width = winMinSize.width;
- if (windowFrame.size.height < winMinSize.height)
- {
+ if (windowFrame.size.height < winMinSize.height) {
windowFrame.size.height = winMinSize.height;
windowFrame.origin.y = oldOriginY;
}
}
- (NSNumber*)extendedAccessibilityIsAttributeSettable: (NSString*)theAttributeName {
- return ([theAttributeName isEqualToString: NSAccessibilitySubroleAttribute] ? [NSNumber numberWithBool: NO] : nil); // make the Subrole attribute we added non-settable
+ return ([theAttributeName isEqualToString: NSAccessibilitySubroleAttribute] ? [NSNumber numberWithBool:NO] : nil); // make the Subrole attribute we added non-settable
}
- (void)accessibilityPerformAction: (NSString*)theActionName {
if ([theActionName isEqualToString: NSAccessibilityPressAction]) {
- if ([self isEnabled]) {
+ if ([self isEnabled])
[self performClick: nil];
- }
- } else {
+ } else
[super accessibilityPerformAction: theActionName];
- }
}
@end
[contextMenu release];
NSURL * representedURL = [[self window] representedURL];
- if (! representedURL)
+ if (!representedURL)
return;
NSArray * pathComponents;
-
- if (OSX_SNOW_LEOPARD || OSX_LION)
- pathComponents = [representedURL pathComponents];
- else
- pathComponents = [[representedURL path] pathComponents];
+ pathComponents = [representedURL pathComponents];
if (!pathComponents)
return;
NSImage * icon;
NSMenuItem * currentItem;
NSMutableString * currentPath;
- NSSize iconSize = NSMakeSize( 16., 16. );
+ NSSize iconSize = NSMakeSize(16., 16.);
for (NSUInteger i = count - 1; i > 0; i--) {
currentPath = [NSMutableString stringWithCapacity:1024];
for (NSUInteger y = 0; y < i; y++)
[currentItem setImage: icon];
}
- if ([[pathComponents objectAtIndex: 1] isEqualToString:@"Users"]) {
- /* we're on the boot drive, so add it is since it isn't part of the components */
+ if ([[pathComponents objectAtIndex:1] isEqualToString:@"Volumes"]) {
+ /* we don't want to show the Volumes item, since the Cocoa does it neither */
+ currentItem = [contextMenu itemWithTitle:[[NSFileManager defaultManager] displayNameAtPath: @"/Volumes"]];
+ if (currentItem)
+ [contextMenu removeItem: currentItem];
+ } else {
+ /* we're on the boot drive, so add it since it isn't part of the components */
[contextMenu addItemWithTitle: [[NSFileManager defaultManager] displayNameAtPath:@"/"] action:@selector(revealInFinder:) keyEquivalent:@""];
currentItem = [contextMenu itemAtIndex: [contextMenu numberOfItems] - 1];
icon = [[NSWorkspace sharedWorkspace] iconForFile:@"/"];
[currentItem setImage: icon];
[currentItem setTarget: self];
- [NSMenu popUpContextMenu: contextMenu withEvent: o_event forView: [self superview]];
+ // center the context menu similar to the white interface
+ CGFloat menuWidth = [contextMenu size].width;
+ NSRect windowFrame = [[self window] frame];
+ NSPoint point;
+
+ CGFloat fullButtonWidth = 0.;
+ if([[VLCMain sharedInstance] nativeFullscreenMode])
+ fullButtonWidth = 20.;
+
+ // assumes 60 px for the window buttons
+ point.x = (windowFrame.size.width - 60. - fullButtonWidth) / 2. - menuWidth / 2. + 60. - 20.;
+ point.y = windowFrame.size.height + 1.;
+ if (point.x < 0)
+ point.x = 10;
+
+ NSEvent *fakeMouseEvent = [NSEvent mouseEventWithType:NSRightMouseDown
+ location:point
+ modifierFlags:0
+ timestamp:0
+ windowNumber:[[self window] windowNumber]
+ context:nil
+ eventNumber:0
+ clickCount:0
+ pressure:0];
+ [NSMenu popUpContextMenu: contextMenu withEvent: fakeMouseEvent forView: [self superview]];
}
- (IBAction)revealInFinder:(id)sender
NSUInteger count = [contextMenu numberOfItems];
NSUInteger selectedItem = [contextMenu indexOfItem: sender];
- if (selectedItem == count - 1) // the fake computer item
- {
+ if (selectedItem == count - 1) { // the fake computer item
[[NSWorkspace sharedWorkspace] selectFile: @"/" inFileViewerRootedAtPath: @""];
return;
}
if (! representedURL)
return;
- if (selectedItem == 0) // the actual file, let's save time
- {
+ if (selectedItem == 0) { // the actual file, let's save time
[[NSWorkspace sharedWorkspace] selectFile: [representedURL path] inFileViewerRootedAtPath: [representedURL path]];
return;
}
NSArray * pathComponents;
- if (OSX_SNOW_LEOPARD || OSX_LION)
- pathComponents = [representedURL pathComponents];
- else
- pathComponents = [[representedURL path] pathComponents];
+ pathComponents = [representedURL pathComponents];
if (!pathComponents)
return;
NSMutableString * currentPath;
currentPath = [NSMutableString stringWithCapacity:1024];
selectedItem = count - selectedItem;
+
+ /* fix for non-startup volumes */
+ if ([[pathComponents objectAtIndex:1] isEqualToString:@"Volumes"])
+ selectedItem += 1;
+
for (NSUInteger y = 1; y < selectedItem; y++)
[currentPath appendFormat: @"/%@", [pathComponents objectAtIndex:y]];
- (void)rightMouseDown:(NSEvent *)o_event
{
- if( [o_event type] == NSRightMouseDown )
+ if ([o_event type] == NSRightMouseDown)
[self showRightClickMenuWithEvent:o_event];
[super mouseDown: o_event];
projects / vlc / blobdiff