summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-07-02 16:37:12 +0000
committerbjarni <bjarni@openttd.org>2007-07-02 16:37:12 +0000
commitbeb673733a342f6f36afddc8783192a8232075cb (patch)
treefc9700e8f01970a93973ddf32af4b6a93a58977b
parent90f85c957ad8e8d2dfd23535701b3079fc2d2718 (diff)
downloadopenttd-beb673733a342f6f36afddc8783192a8232075cb.tar.xz
(svn r10410) -Fix [FS458]: [OSX] if the resolution is changed to something that's too high for the monitor, then it's reduced to fit the monitor size (PinguTux)
This solves a possible crash This also solves a graphical glitch where the titlebar can be drawn on top of the game area Those issues only aplied to window mode
-rw-r--r--src/video/cocoa_v.mm7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/video/cocoa_v.mm b/src/video/cocoa_v.mm
index 1481bc606..debbc2f53 100644
--- a/src/video/cocoa_v.mm
+++ b/src/video/cocoa_v.mm
@@ -1184,10 +1184,17 @@ static const char* QZ_SetVideoWindowed(uint width, uint height)
/* We already have a window, just change its size */
if (!isCustom) {
[ _cocoa_video_data.window setContentSize:contentRect.size ];
+ // Ensure frame height - title bar height >= view height
+ contentRect.size.height = clamp(height, 0, [ _cocoa_video_data.window frame ].size.height - 22 /* 22 is the height of title bar of window*/);
+ height = contentRect.size.height;
[ _cocoa_video_data.qdview setFrameSize:contentRect.size ];
}
}
+ // Update again
+ _cocoa_video_data.width = width;
+ _cocoa_video_data.height = height;
+
[ _cocoa_video_data.window center ];
/* Only recreate the view if it doesn't already exist */