From: Pierre d'Herbemont Date: Sat, 3 Mar 2007 00:46:25 +0000 (+0000) Subject: Fix main screen detection for the detached window on Mac OS X. X-Git-Tag: 0.9.0-test0~8311 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2f8dbe1e38858b0c2f37a22f341868fb3d780f6c;hp=144e4cc2d6cca2f7cdfd44ddd035b1faf9d79248;p=vlc Fix main screen detection for the detached window on Mac OS X. --- diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 7815331080..2d9b3a1d04 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -925,8 +925,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if(!([o_window isFullscreen])) [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])]; } return b_return; @@ -1001,7 +999,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, if( !o_screen ) o_screen = [NSScreen mainScreen]; - if( o_screen == [NSScreen mainScreen] ) + if( [o_screen isMainScreen] ) b_menubar_screen = VLC_TRUE; if( p_vout->b_fullscreen )