Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removes special handling of fullscreen toggle on OS X w/ SDL 1.2, which is no longer used

Browse Source 
This was SVN commit r16453.
This commit is contained in:
historic_bruno 2015-03-21 21:01:01 +00:00
parent f680caa14f
commit dec4552ffe
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/main.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Wildfire Games. /* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -155,12 +155,7 @@ static InReaction MainInputHandler(const SDL_Event_* ev)
} }
else if (hotkey == "togglefullscreen") else if (hotkey == "togglefullscreen")
{ {
#if !OS_MACOSX || SDL_VERSION_ATLEAST(2, 0, 0)
// Fullscreen toggling is broken on OS X w/ SDL 1.2, see http://trac.wildfiregames.com/ticket/741
g_VideoMode.ToggleFullscreen(); g_VideoMode.ToggleFullscreen();
#else
LOGWARNING("Toggling fullscreen and resizing are disabled on OS X due to a known bug. Please use the config file to change display settings.");
#endif
return IN_HANDLED; return IN_HANDLED;
} }
else if (hotkey == "profile2.toggle") else if (hotkey == "profile2.toggle")

5
source/ps/VideoMode.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Wildfire Games. /* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@ -159,11 +159,8 @@ bool CVideoMode::SetVideoMode(int w, int h, int bpp, bool fullscreen)
Uint32 flags = SDL_OPENGL; Uint32 flags = SDL_OPENGL;
if (fullscreen) if (fullscreen)
flags |= SDL_FULLSCREEN; flags |= SDL_FULLSCREEN;
#if !OS_MACOSX
// TODO: Fix window resizing on OS X, see http://trac.wildfiregames.com/ticket/741
else else
flags |= SDL_RESIZABLE; flags |= SDL_RESIZABLE;
#endif
SDL_Surface* screen = SDL_SetVideoMode(w, h, bpp, flags); SDL_Surface* screen = SDL_SetVideoMode(w, h, bpp, flags);