Skip to content

V
vlc-2-2
Commit 2f8dbe1e authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

Fix main screen detection for the detached window on Mac OS X.

parent 144e4cc2
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
modules/gui/macosx/vout.m
View file @ 2f8dbe1e
...@@ -925,8 +925,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -925,8 +925,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if(!([o_window isFullscreen])) if(!([o_window isFullscreen]))
[o_window makeKeyAndOrderFront: self]; [o_window makeKeyAndOrderFront: self];
NSLog(@"We are %s animating (%s)", [o_window isVisible] && (![o_window isFullscreen]) ? "" :"not", [o_window isFullscreen] ? "fullscreen" : "");
[self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])]; [self scaleWindowWithFactor: 1.0 animate: [o_window isVisible] && (![o_window isFullscreen])];
} }
return b_return; return b_return;
...@@ -1001,7 +999,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1001,7 +999,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( !o_screen ) if( !o_screen )
o_screen = [NSScreen mainScreen]; o_screen = [NSScreen mainScreen];
if( o_screen == [NSScreen mainScreen] ) if( [o_screen isMainScreen] )
b_menubar_screen = VLC_TRUE; b_menubar_screen = VLC_TRUE;
if( p_vout->b_fullscreen ) if( p_vout->b_fullscreen )
......
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