Commit 5fcefdc6 authored by David Fuhrmann's avatar David Fuhrmann

macosx: lion fullscreen: show fs controller not before animation is finished

(cherry picked from commit 69d5d9aeaac87a57b67d18a98736066d77d06524)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent 1dca657f
...@@ -95,6 +95,7 @@ enum { ...@@ -95,6 +95,7 @@ enum {
- (void)setRestorable:(BOOL)b_value; - (void)setRestorable:(BOOL)b_value;
- (void)toggleFullScreen:(id)id_value; - (void)toggleFullScreen:(id)id_value;
- (void)windowWillEnterFullScreen:(NSNotification *)notification; - (void)windowWillEnterFullScreen:(NSNotification *)notification;
- (void)windowDidEnterFullScreen:(NSNotification *)notification;
- (void)windowWillExitFullScreen:(NSNotification *)notification; - (void)windowWillExitFullScreen:(NSNotification *)notification;
@end @end
......
...@@ -196,6 +196,7 @@ ...@@ -196,6 +196,7 @@
/* lion's native fullscreen handling */ /* lion's native fullscreen handling */
- (void)windowWillEnterFullScreen:(NSNotification *)notification; - (void)windowWillEnterFullScreen:(NSNotification *)notification;
- (void)windowDidEnterFullScreen:(NSNotification *)notification;
- (void)windowWillExitFullScreen:(NSNotification *)notification; - (void)windowWillExitFullScreen:(NSNotification *)notification;
@end @end
......
...@@ -2095,8 +2095,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2095,8 +2095,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_video_view setFrame: [[self contentView] frame]]; [o_video_view setFrame: [[self contentView] frame]];
b_fullscreen = YES; b_fullscreen = YES;
[o_fspanel setVoutWasUpdated: (int)[[self screen] displayID]];
[o_fspanel setActive: nil];
[self recreateHideMouseTimer]; [self recreateHideMouseTimer];
i_originalLevel = [self level]; i_originalLevel = [self level];
...@@ -2123,6 +2121,12 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -2123,6 +2121,12 @@ static VLCMainWindow *_o_sharedInstance = nil;
[self setMovableByWindowBackground: NO]; [self setMovableByWindowBackground: NO];
} }
- (void)windowDidEnterFullScreen:(NSNotification *)notification
{
[o_fspanel setVoutWasUpdated: (int)[[self screen] displayID]];
[o_fspanel setActive: nil];
}
- (void)windowWillExitFullScreen:(NSNotification *)notification - (void)windowWillExitFullScreen:(NSNotification *)notification
{ {
......
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