mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 04:06:40 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'swick/sdl2fix'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-07-29 13:51:00 +02:00
commit a547c2584e
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libs/openengine/ogre/renderer.cpp
View file

@ -245,25 +245,23 @@ void OgreRenderer::createWindow(const std::string &title, const WindowSettings&
params.insert(std::make_pair("FSAA", settings.fsaa)); params.insert(std::make_pair("FSAA", settings.fsaa));
params.insert(std::make_pair("vsync", settings.vsync ? "true" : "false")); params.insert(std::make_pair("vsync", settings.vsync ? "true" : "false"));
int pos_x = SDL_WINDOWPOS_UNDEFINED, int pos_x = SDL_WINDOWPOS_CENTERED_DISPLAY(settings.screen),
pos_y = SDL_WINDOWPOS_UNDEFINED; pos_y = SDL_WINDOWPOS_CENTERED_DISPLAY(settings.screen);
if(settings.fullscreen) if(settings.fullscreen)
{ {
SDL_Rect display_bounds; pos_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(settings.screen);
if(SDL_GetDisplayBounds(settings.screen, &display_bounds) != 0) pos_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(settings.screen);
throw std::runtime_error("Couldn't get display bounds!");
pos_x = display_bounds.x;
pos_y = display_bounds.y;
} }
// Create an application window with the following settings: // Create an application window with the following settings:
mSDLWindow = SDL_CreateWindow( mSDLWindow = SDL_CreateWindow(
"OpenMW", // window title "OpenMW", // window title
pos_x, // initial x position pos_x, // initial x position
pos_y, // initial y position pos_y, // initial y position
settings.window_x, // width, in pixels settings.window_x, // width, in pixels
settings.window_y, // height, in pixels settings.window_y, // height, in pixels
SDL_WINDOW_SHOWN SDL_WINDOW_SHOWN
| (settings.fullscreen ? SDL_WINDOW_FULLSCREEN : 0) | SDL_WINDOW_RESIZABLE | (settings.fullscreen ? SDL_WINDOW_FULLSCREEN : 0) | SDL_WINDOW_RESIZABLE
); );