Commit 42fad58d authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

macosx: hide the titlebar's fullscreen button if we don't use Lion's fullscreen mode

(cherry picked from commit 64280ec9ddfce2cf6e99e00d4b7087b1e2313c7e)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 14311e59
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#import <vlc_input.h> #import <vlc_input.h>
#import "misc.h" #import "misc.h"
#import "fspanel.h" #import "fspanel.h"
#import "MainWindowTitle.h"
@interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate> { @interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate> {
IBOutlet id o_play_btn; IBOutlet id o_play_btn;
......
...@@ -277,6 +277,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -277,6 +277,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_fullscreen_btn removeFromSuperviewWithoutNeedingDisplay]; [o_fullscreen_btn removeFromSuperviewWithoutNeedingDisplay];
} }
else
[o_titlebar_view setFullscreenButtonHidden: YES];
if (OSX_LION) if (OSX_LION)
{ {
/* the default small size of the search field is slightly different on Lion, let's work-around that */ /* the default small size of the search field is slightly different on Lion, let's work-around that */
......
...@@ -38,5 +38,6 @@ ...@@ -38,5 +38,6 @@
- (IBAction)buttonAction:(id)sender; - (IBAction)buttonAction:(id)sender;
- (void)setWindowTitle:(NSString *)title; - (void)setWindowTitle:(NSString *)title;
- (void)setFullscreenButtonHidden:(BOOL)b_value;
@end @end
...@@ -67,4 +67,9 @@ ...@@ -67,4 +67,9 @@
[o_title_lbl setStringValue: title]; [o_title_lbl setStringValue: title];
} }
- (void)setFullscreenButtonHidden:(BOOL)b_value
{
[o_fullscreen_btn setHidden: b_value];
}
@end @end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment