Commit ad0e05bf authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Felix Paul Kühne

macosx: improve main window initialization

This targets the same issue as 5b8a4057, but in a saner approach
(cherry picked from commit f0a7d9a4906754d9c4c5f84354953e8bda79f535)

Conflicts:
	extras/package/macosx/Resources/English.lproj/MainMenu.xib
parent 653794ff
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -650,11 +650,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -650,11 +650,6 @@ static VLCMain *_o_sharedMainInstance = nil;
[[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"vlc-xmas"]]; [[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"vlc-xmas"]];
} }
[o_mainwindow updateWindow];
[o_mainwindow updateTimeSlider];
[o_mainwindow updateVolumeSlider];
[o_mainwindow makeKeyAndOrderFront: self];
[self initStrings]; [self initStrings];
nib_main_loaded = TRUE; nib_main_loaded = TRUE;
...@@ -688,6 +683,11 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -688,6 +683,11 @@ static VLCMain *_o_sharedMainInstance = nil;
/* we will need this, so let's load it here so the interface appears to be more responsive */ /* we will need this, so let's load it here so the interface appears to be more responsive */
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
/* update the main window */
[o_mainwindow updateWindow];
[o_mainwindow updateTimeSlider];
[o_mainwindow updateVolumeSlider];
} }
- (void)initStrings - (void)initStrings
......
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