mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-31 21:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Mac OS X 10.6 support

Browse Source 
This time it *should* be ok!
This commit is contained in:
Marco Antognini 2012-04-29 21:12:39 +02:00
parent b18b771c33
commit 19cdceb039
1 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/SFML/Window/OSX/SFOpenGLView.mm
View File

@ -169,50 +169,25 @@ NSUInteger keepOnlyMaskFromData(NSUInteger data, NSUInteger mask);
// but the recommended -[NSWindow convertRectToScreen] is not // but the recommended -[NSWindow convertRectToScreen] is not
// available until 10.7. // available until 10.7.
// //
// So we choose at runtime which code to execute. // So we stick with the old one for now.
#ifndef NSAppKitVersionNumber10_6 // Flip SFML coordinates to match window coordinates
#define NSAppKitVersionNumber10_6 1038 y = [self frame].size.height - y;
#endif
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) { // Get the position of (x, y) in the coordinate system of the window.
NSPoint p = [self convertPoint:NSMakePoint(x, y) toView:self];
p = [self convertPoint:p toView:nil]; // nil means window
// Flip SFML coordinates to match window coordinates // Convert it to screen coordinates
y = [self frame].size.height - y; p = [[self window] convertBaseToScreen:p];
// Get the position of (x, y) in the coordinate system of the window. // Flip screen coodinates to match CGDisplayMoveCursorToPoint referential.
NSRect r = [self convertRect:NSMakeRect(x, y, 1, 1) toView:self]; float const screenHeight = [[[self window] screen] frame].size.height;
r = [self convertRect:r toView:nil]; // nil means window p.y = screenHeight - p.y;
// Convert it to screen coordinates x = p.x;
r = [[self window] convertRectToScreen:r]; y = p.y;
// Flip screen coodinates to match CGDisplayMoveCursorToPoint referential.
float const screenHeight = [[[self window] screen] frame].size.height;
r.origin.y = screenHeight - r.origin.y;
x = r.origin.x;
y = r.origin.y;
} else { // 10.6 or lower
// Flip SFML coordinates to match window coordinates
y = [self frame].size.height - y;
// Get the position of (x, y) in the coordinate system of the window.
NSPoint p = [self convertPoint:NSMakePoint(x, y) toView:self];
p = [self convertPoint:p toView:nil]; // nil means window
// Convert it to screen coordinates
p = [[self window] convertBaseToScreen:p];
// Flip screen coodinates to match CGDisplayMoveCursorToPoint referential.
float const screenHeight = [[[self window] screen] frame].size.height;
p.y = screenHeight - p.y;
x = p.x;
y = p.y;
}
// Get the id of the screen // Get the id of the screen