From 144e4cc2d6cca2f7cdfd44ddd035b1faf9d79248 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Sat, 3 Mar 2007 00:29:56 +0000 Subject: [PATCH] Fix main screen detection on Mac OS X. --- modules/gui/macosx/embeddedwindow.m | 4 ++-- modules/gui/macosx/misc.h | 1 + modules/gui/macosx/misc.m | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m index 7510e78767..02c848814f 100644 --- a/modules/gui/macosx/embeddedwindow.m +++ b/modules/gui/macosx/embeddedwindow.m @@ -193,7 +193,7 @@ CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES ); - if (screen == [NSScreen mainScreen]) + if ([screen isMainScreen]) SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); [[self contentView] replaceSubview:o_view with:o_temp_view]; @@ -239,7 +239,7 @@ [o_fullscreen_anim2 release]; } - if (screen == [NSScreen mainScreen]) + if ([screen isMainScreen]) SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); dict1 = [[NSMutableDictionary alloc] initWithCapacity:2]; diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h index 9cb548e109..6a636d81c2 100644 --- a/modules/gui/macosx/misc.h +++ b/modules/gui/macosx/misc.h @@ -41,6 +41,7 @@ @interface NSScreen (VLCAdditions) + (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID; +- (BOOL)isMainScreen; - (CGDirectDisplayID)displayID; - (void)blackoutOtherScreens; + (void)unblackoutScreens; diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index b60ec2e564..b61c60107a 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -90,6 +90,11 @@ static NSMutableArray *blackoutWindows = NULL; return nil; } +- (BOOL)isMainScreen +{ + return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]); +} + - (CGDirectDisplayID)displayID { return (CGDirectDisplayID)_screenNumber; -- 2.39.5