vlc | branch: master | David Fuhrmann <[email protected]> | Wed Oct 1 16:03:33 2014 +0200| [2c674d76924785536fef66929b7ddcb08dde585b] | committer: David Fuhrmann
macosx: add yosemite guard > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c674d76924785536fef66929b7ddcb08dde585b --- modules/gui/macosx/CompatibilityFixes.h | 4 +++- modules/gui/macosx/Windows.m | 2 +- modules/gui/macosx/intf.m | 2 +- modules/gui/macosx/misc.m | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h index caab7d5..d2210dd 100644 --- a/modules/gui/macosx/CompatibilityFixes.h +++ b/modules/gui/macosx/CompatibilityFixes.h @@ -28,7 +28,9 @@ #define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038) #define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2) #define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 && NSAppKitVersionNumber >= 1162) -#define OSX_MAVERICKS NSAppKitVersionNumber >= 1244 +#define OSX_MAVERICKS (NSAppKitVersionNumber < 1334 && NSAppKitVersionNumber >= 1244) +#define OSX_YOSEMITE NSAppKitVersionNumber >= 1334 + #pragma mark - #pragma Fixes for OS X Snow Leopard (10.6) diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m index 4f6bfc6..b78fe6a 100644 --- a/modules/gui/macosx/Windows.m +++ b/modules/gui/macosx/Windows.m @@ -256,7 +256,7 @@ BOOL b_inFullscreen = [self fullscreen] || ([self respondsToSelector:@selector(inFullscreenTransition)] && [(VLCVideoWindowCommon *)self inFullscreenTransition]); - if(OSX_MAVERICKS && b_inFullscreen && constrainedRect.size.width == screenRect.size.width + if((OSX_MAVERICKS || OSX_YOSEMITE) && b_inFullscreen && constrainedRect.size.width == screenRect.size.width && constrainedRect.size.height != screenRect.size.height && abs(screenRect.size.height - constrainedRect.size.height) <= 25.) { diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 71a9b17..75ba46c 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1492,7 +1492,7 @@ static bool f_appExit = false; IOReturn success; /* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x < 10.7.4, 10.8 and 10.6 */ - if ((NSAppKitVersionNumber >= 1115.2 && NSAppKitVersionNumber < 1138.45) || OSX_MOUNTAIN_LION || OSX_MAVERICKS || OSX_SNOW_LEOPARD) { + if ((NSAppKitVersionNumber >= 1115.2 && NSAppKitVersionNumber < 1138.45) || OSX_MOUNTAIN_LION || OSX_MAVERICKS || OSX_YOSEMITE || OSX_SNOW_LEOPARD) { CFStringRef reasonForActivity = CFStringCreateWithCString(kCFAllocatorDefault, _("VLC media playback"), kCFStringEncodingUTF8); if ([self activeVideoPlayback]) success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, reasonForActivity, &systemSleepAssertionID); diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index 24983c8..5747e37 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -173,7 +173,7 @@ static bool b_old_spaces_style = YES; /* init our fake object attribute */ blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1]; - if (OSX_MAVERICKS) { + if (OSX_MAVERICKS || OSX_YOSEMITE) { NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; [userDefaults addSuiteNamed:@"com.apple.spaces"]; /* this is system settings -> mission control -> monitors using different spaces */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
