From 6574e622f7b4662f8f1095e6ba120b84605ca1d6 Mon Sep 17 00:00:00 2001 From: bjarni Date: Mon, 2 Jul 2007 16:37:12 +0000 Subject: [PATCH] (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 --- src/video/cocoa_v.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/video/cocoa_v.mm b/src/video/cocoa_v.mm index 1481bc606a..debbc2f531 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 */