[o_green_img release];
[o_green_over_img release];
[o_green_on_img release];
+ [o_fullscreen_img release];
+ [o_fullscreen_over_img release];
+ [o_fullscreen_on_img release];
+ [o_old_fullscreen_img release];
+ [o_old_fullscreen_over_img release];
+ [o_old_fullscreen_on_img release];
[o_window_title_shadow release];
[o_window_title_attributes_dict release];
- (void)awakeFromNib
{
+ b_nativeFullscreenMode = NO;
+#ifdef MAC_OS_X_VERSION_10_7
+ if (!OSX_SNOW_LEOPARD)
+ b_nativeFullscreenMode = var_InheritBool(VLCIntf, "macosx-nativefullscreenmode");
+#endif
+
+ if (!b_nativeFullscreenMode || OSX_YOSEMITE) {
+ [o_fullscreen_btn setHidden: YES];
+ }
+
[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
+{
+ [self loadButtonIcons];
+
+ [o_red_btn setNeedsDisplay];
+ [o_yellow_btn setNeedsDisplay];
+ [o_green_btn setNeedsDisplay];
+}
+
+- (void)informModifierPressed:(BOOL)b_is_altkey;
+{
+ BOOL b_state_changed = b_alt_pressed != b_is_altkey;
+
+ b_alt_pressed = b_is_altkey;
+
+ if (b_state_changed) {
+ [self updateGreenButton];
+ }
+}
+
+- (NSImage *)getButtonImage:(NSString *)o_id
+{
+ NSString *o_name = @"";
+ if (OSX_SNOW_LEOPARD) {
+ o_name = @"snowleo-";
+ } else if (OSX_YOSEMITE) {
+ o_name = @"yosemite-";
+ } else { // OSX_LION, OSX_MOUNTAIN_LION, OSX_MAVERICKS
+ o_name = @"lion-";
+ }
+
+ o_name = [o_name stringByAppendingString:o_id];
+
+ if ([NSColor currentControlTint] != NSBlueControlTint) {
+ o_name = [o_name stringByAppendingString:@"-graphite"];
+ }
+
+ return [NSImage imageNamed:o_name];
+}
+
+- (void)loadButtonIcons
{
[o_red_img release];
[o_red_over_img release];
[o_green_img release];
[o_green_over_img release];
[o_green_on_img release];
+ [o_fullscreen_img release];
+ [o_fullscreen_over_img release];
+ [o_fullscreen_on_img release];
+ [o_old_fullscreen_img release];
+ [o_old_fullscreen_over_img release];
+ [o_old_fullscreen_on_img release];
+
+ o_red_img = [[self getButtonImage:@"window-close"] retain];
+ o_red_over_img = [[self getButtonImage:@"window-close-over"] retain];
+ o_red_on_img = [[self getButtonImage:@"window-close-on"] retain];
+ o_yellow_img = [[self getButtonImage:@"window-minimize"] retain];
+ o_yellow_over_img = [[self getButtonImage:@"window-minimize-over"] retain];
+ o_yellow_on_img = [[self getButtonImage:@"window-minimize-on"] retain];
+ o_green_img = [[self getButtonImage:@"window-zoom"] retain];
+ o_green_over_img = [[self getButtonImage:@"window-zoom-over"] retain];
+ o_green_on_img = [[self getButtonImage:@"window-zoom-on"] retain];
+
+ // these files are only available in the yosemite variant
+ if (OSX_YOSEMITE) {
+ o_fullscreen_img = [[self getButtonImage:@"window-fullscreen"] retain];
+ o_fullscreen_over_img = [[self getButtonImage:@"window-fullscreen-over"] retain];
+ o_fullscreen_on_img = [[self getButtonImage:@"window-fullscreen-on"] retain];
+ }
- [self loadButtonIcons];
+ // old native fullscreen images are not available in graphite style
+ // thus they are loaded directly here
+ o_old_fullscreen_img = [[NSImage imageNamed:@"lion-window-fullscreen"] retain];
+ o_old_fullscreen_on_img = [[NSImage imageNamed:@"lion-window-fullscreen-on"] retain];
+ o_old_fullscreen_over_img = [[NSImage imageNamed:@"lion-window-fullscreen-over"] retain];
- [o_red_btn setNeedsDisplay];
- [o_yellow_btn setNeedsDisplay];
- [o_green_btn setNeedsDisplay];
+ [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];
+
+ [self updateGreenButton];
+ [[o_green_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
+ [[o_green_btn cell] setTag: 2];
+
+ [o_fullscreen_btn setImage: o_old_fullscreen_img];
+ [o_fullscreen_btn setAlternateImage: o_old_fullscreen_on_img];
+ [[o_fullscreen_btn cell] setShowsBorderOnlyWhileMouseInside: YES];
+ [[o_fullscreen_btn cell] setTag: 3];
}
-- (void)loadButtonIcons
+- (void)updateGreenButton
{
- 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_red_on_img = [[NSImage imageNamed:@"lion-window-close-on"] retain];
- o_yellow_img = [[NSImage imageNamed:@"lion-window-minimize"] retain];
- o_yellow_over_img = [[NSImage imageNamed:@"lion-window-minimize-over"] retain];
- o_yellow_on_img = [[NSImage imageNamed:@"lion-window-minimize-on"] retain];
- o_green_img = [[NSImage imageNamed:@"lion-window-zoom"] retain];
- o_green_over_img = [[NSImage imageNamed:@"lion-window-zoom-over"] retain];
- o_green_on_img = [[NSImage imageNamed:@"lion-window-zoom-on"] retain];
+ // default image for old version, or if native fullscreen is
+ // disabled on yosemite, or if alt key is pressed
+ if (!OSX_YOSEMITE || !b_nativeFullscreenMode || b_alt_pressed) {
+
+ if (b_mouse_over) {
+ [o_green_btn setImage: o_green_over_img];
+ [o_green_btn setAlternateImage: o_green_on_img];
} else {
- o_red_img = [[NSImage imageNamed:@"lion-window-close-graphite"] retain];
- o_red_over_img = [[NSImage imageNamed:@"lion-window-close-over-graphite"] retain];
- o_red_on_img = [[NSImage imageNamed:@"lion-window-close-on-graphite"] retain];
- o_yellow_img = [[NSImage imageNamed:@"lion-window-minimize-graphite"] retain];
- o_yellow_over_img = [[NSImage imageNamed:@"lion-window-minimize-over-graphite"] retain];
- o_yellow_on_img = [[NSImage imageNamed:@"lion-window-minimize-on-graphite"] retain];
- o_green_img = [[NSImage imageNamed:@"lion-window-zoom-graphite"] retain];
- o_green_over_img = [[NSImage imageNamed:@"lion-window-zoom-over-graphite"] retain];
- o_green_on_img = [[NSImage imageNamed:@"lion-window-zoom-on-graphite"] retain];
+ [o_green_btn setImage: o_green_img];
+ [o_green_btn setAlternateImage: o_green_on_img];
}
} else {
- 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_red_on_img = [[NSImage imageNamed:@"snowleo-window-close-on"] retain];
- o_yellow_img = [[NSImage imageNamed:@"snowleo-window-minimize"] retain];
- o_yellow_over_img = [[NSImage imageNamed:@"snowleo-window-minimize-over"] retain];
- o_yellow_on_img = [[NSImage imageNamed:@"snowleo-window-minimize-on"] retain];
- o_green_img = [[NSImage imageNamed:@"snowleo-window-zoom"] retain];
- o_green_over_img = [[NSImage imageNamed:@"snowleo-window-zoom-over"] retain];
- o_green_on_img = [[NSImage imageNamed:@"snowleo-window-zoom-on"] retain];
+
+ if (b_mouse_over) {
+ [o_green_btn setImage: o_fullscreen_over_img];
+ [o_green_btn setAlternateImage: o_fullscreen_on_img];
} else {
- o_red_img = [[NSImage imageNamed:@"snowleo-window-close-graphite"] retain];
- o_red_over_img = [[NSImage imageNamed:@"snowleo-window-close-over-graphite"] retain];
- o_red_on_img = [[NSImage imageNamed:@"snowleo-window-close-on-graphite"] retain];
- o_yellow_img = [[NSImage imageNamed:@"snowleo-window-minimize-graphite"] retain];
- o_yellow_over_img = [[NSImage imageNamed:@"snowleo-window-minimize-over-graphite"] retain];
- o_yellow_on_img = [[NSImage imageNamed:@"snowleo-window-minimize-on-graphite"] retain];
- o_green_img = [[NSImage imageNamed:@"snowleo-window-zoom-graphite"] retain];
- o_green_over_img = [[NSImage imageNamed:@"snowleo-window-zoom-over-graphite"] retain];
- o_green_on_img = [[NSImage imageNamed:@"snowleo-window-zoom-on-graphite"] retain];
+ [o_green_btn setImage: o_fullscreen_img];
+ [o_green_btn setAlternateImage: o_fullscreen_on_img];
}
}
}
[[self window] performClose: sender];
else if (sender == o_yellow_btn)
[[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);
-
- vout_thread_t *p_vout = getVout();
- if (p_vout) {
- var_SetBool(p_vout, "fullscreen", true);
- vlc_object_release(p_vout);
+ else if (sender == o_green_btn) {
+ if (OSX_YOSEMITE && b_nativeFullscreenMode && !b_alt_pressed) {
+ [[self window] toggleFullScreen:self];
+ } else {
+ [[self window] performZoom: sender];
}
+ } else if (sender == o_fullscreen_btn) {
+ // same action as native fs button
+ [[self window] toggleFullScreen:self];
+
} else
msg_Err(VLCIntf, "unknown button action sender");
[o_attributed_title release];
}
-- (void)setFullscreenButtonHidden:(BOOL)b_value
-{
- [o_fullscreen_btn setHidden: b_value];
-}
-
- (void)setWindowButtonOver:(BOOL)b_value
{
+ b_mouse_over = 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 {
[o_red_btn setImage: o_red_img];
[o_yellow_btn setImage: o_yellow_img];
- [o_green_btn setImage: o_green_img];
}
+
+ [self updateGreenButton];
}
- (void)setWindowFullscreenButtonOver:(BOOL)b_value
{
if (b_value)
- [o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen-over"]];
+ [o_fullscreen_btn setImage: o_old_fullscreen_over_img];
else
- [o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen"]];
+ [o_fullscreen_btn setImage: o_old_fullscreen_img];
}
- (void)mouseDown:(NSEvent *)event
}
- (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 {
[contextMenu release];
NSURL * representedURL = [[self window] representedURL];
- if (! representedURL)
+ if (!representedURL)
return;
NSArray * pathComponents;
[currentItem setImage: icon];
}
- if ([[pathComponents objectAtIndex: 1] isEqualToString:@"Volumes"]) {
+ 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)
[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
projects / vlc / blobdiff