From 0c233487ecb0035d9d7a0878f90c1d18f03ea4cc Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Fri, 4 May 2012 23:30:46 +0000 Subject: [PATCH] Disables broken window resizing and fullscreen toggling on OS X. Fixes #1381. Refs #741 This was SVN commit r11752. --- source/main.cpp | 3 +++ source/ps/VideoMode.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/source/main.cpp b/source/main.cpp index 8999dd1948..732910d2f2 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -153,7 +153,10 @@ static InReaction MainInputHandler(const SDL_Event_* ev) } else if (hotkey == "togglefullscreen") { +#if !OS_MACOSX + // TODO: Fix fullscreen toggling on OS X, see http://trac.wildfiregames.com/ticket/741 g_VideoMode.ToggleFullscreen(); +#endif return IN_HANDLED; } else if (hotkey == "profile2.enable") diff --git a/source/ps/VideoMode.cpp b/source/ps/VideoMode.cpp index 5115dbc049..4e8b336323 100644 --- a/source/ps/VideoMode.cpp +++ b/source/ps/VideoMode.cpp @@ -110,8 +110,11 @@ bool CVideoMode::SetVideoMode(int w, int h, int bpp, bool fullscreen) Uint32 flags = SDL_OPENGL; if (fullscreen) flags |= SDL_FULLSCREEN; +#if !OS_MACOSX + // TODO: Fix window resizing on OS X, see http://trac.wildfiregames.com/ticket/741 else flags |= SDL_RESIZABLE; +#endif SDL_Surface* screen = SDL_SetVideoMode(w, h, bpp, flags);