mirror of
https://github.com/SFML/SFML.git
synced 2024-11-28 22:31:09 +08:00
OSX, forget to remove NSLog..
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1775 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
8d9de8396b
commit
206aebd46a
@ -423,21 +423,17 @@
|
|||||||
|
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
-(float)screenHeight {
|
-(float)screenHeight {
|
||||||
NSLog(@"hihi");
|
|
||||||
// With Mac OS X 10.4 and 10.5, there is a shift upwards
|
// With Mac OS X 10.4 and 10.5, there is a shift upwards
|
||||||
// (about 22px – that is the apple menu bar height). With 10.6 and later
|
// (about 22px – that is the apple menu bar height). With 10.6 and later
|
||||||
// we have a workaround : we hide the dock and get the visibleFrame of the
|
// we have a workaround : we hide the dock and get the visibleFrame of the
|
||||||
// screen (see NSApplicationPresentationOptions and NSScreen for more info).
|
// screen (see NSApplicationPresentationOptions and NSScreen for more info).
|
||||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
|
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
|
||||||
NSLog(@"<1060");
|
|
||||||
return NSHeight([[myWindow screen] frame]);
|
return NSHeight([[myWindow screen] frame]);
|
||||||
|
|
||||||
#else // (NSApplicationPresentationOptions Availability: Mac OS X 10.6 and later)
|
#else // (NSApplicationPresentationOptions Availability: Mac OS X 10.6 and later)
|
||||||
// We want to recompute it because the user may have moved the window to another screen
|
// We want to recompute it because the user may have moved the window to another screen
|
||||||
// since last time.
|
// since last time.
|
||||||
|
|
||||||
NSLog(@">=1060");
|
|
||||||
|
|
||||||
static float height = 0.f;
|
static float height = 0.f;
|
||||||
static NSDate* lastTime = [NSDate date];
|
static NSDate* lastTime = [NSDate date];
|
||||||
if (height > 1.f && // height was set at least once.
|
if (height > 1.f && // height was set at least once.
|
||||||
|
Loading…
Reference in New Issue
Block a user