Commit 1aca75ad authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fix mediainfo appearance on future OS X releases (close #12066)

(cherry picked from commit 496c2575e067edc195227380c41ed69016df36bb)
parent f4ae6b0c
...@@ -611,7 +611,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -611,7 +611,6 @@ static VLCMain *_o_sharedMainInstance = nil;
o_open = [[VLCOpen alloc] init]; o_open = [[VLCOpen alloc] init];
o_coredialogs = [[VLCCoreDialogProvider alloc] init]; o_coredialogs = [[VLCCoreDialogProvider alloc] init];
o_info = [[VLCInfo alloc] init];
o_mainmenu = [[VLCMainMenu alloc] init]; o_mainmenu = [[VLCMainMenu alloc] init];
o_coreinteraction = [[VLCCoreInteraction alloc] init]; o_coreinteraction = [[VLCCoreInteraction alloc] init];
o_eyetv = [[VLCEyeTVController alloc] init]; o_eyetv = [[VLCEyeTVController alloc] init];
...@@ -1644,6 +1643,9 @@ static bool f_appExit = false; ...@@ -1644,6 +1643,9 @@ static bool f_appExit = false;
- (id)info - (id)info
{ {
if (!o_info)
o_info = [[VLCInfo alloc] init];
if (! nib_info_loaded) if (! nib_info_loaded)
nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: NSApp]; nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: NSApp];
......
...@@ -65,7 +65,6 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -65,7 +65,6 @@ static VLCInfo *_o_sharedInstance = nil;
- (void)awakeFromNib - (void)awakeFromNib
{ {
[o_info_window setExcludedFromWindowsMenu: YES]; [o_info_window setExcludedFromWindowsMenu: YES];
[o_info_window setFloatingPanel: NO];
if (!OSX_SNOW_LEOPARD) if (!OSX_SNOW_LEOPARD)
[o_info_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; [o_info_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
...@@ -115,7 +114,6 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -115,7 +114,6 @@ static VLCInfo *_o_sharedInstance = nil;
[o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")]; [o_lost_abuffers_lbl setStringValue: _NS("Lost buffers")];
[o_info_window setInitialFirstResponder: o_uri_txt]; [o_info_window setInitialFirstResponder: o_uri_txt];
[o_info_window setDelegate: self];
b_awakeFromNib = YES; b_awakeFromNib = YES;
...@@ -153,7 +151,7 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -153,7 +151,7 @@ static VLCInfo *_o_sharedInstance = nil;
NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentWindowLevel]; NSInteger i_level = [[[VLCMain sharedInstance] voutController] currentWindowLevel];
[o_info_window setLevel: i_level]; [o_info_window setLevel: i_level];
[o_info_window makeKeyAndOrderFront: self]; [o_info_window makeKeyAndOrderFront:nil];
} }
- (void)initMediaPanelStats - (void)initMediaPanelStats
......
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