Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2085 part 2: ported '4 pixels width increment' bugfix to linux, and to 1.72-maintenance

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2086 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2009-03-07 21:34:45 +00:00
parent 2453d9a772
commit a5f2d8b916
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SDL/MyOpenGLView.m
View File

@ -161,7 +161,7 @@ MA 02110-1301, USA.
#if !SDL_SPLASH #if !SDL_SPLASH
//Windows TODO: decouple mouse boundaries, snapshots & planet roundness from initial setVideoMode resolution. // new SDL.dll decouples mouse boundaries, snapshots & planet roundness from SetVideoMode.
surface = SDL_SetVideoMode(firstScreen.width, firstScreen.height, 32, videoModeFlags); surface = SDL_SetVideoMode(firstScreen.width, firstScreen.height, 32, videoModeFlags);
// blank the surface / go to fullscreen // blank the surface / go to fullscreen
[self initialiseGLWithSize: firstScreen]; [self initialiseGLWithSize: firstScreen];
@ -225,6 +225,7 @@ MA 02110-1301, USA.
videoModeFlags |= (fullScreen) ? SDL_FULLSCREEN : SDL_RESIZABLE; videoModeFlags |= (fullScreen) ? SDL_FULLSCREEN : SDL_RESIZABLE;
surface = SDL_SetVideoMode(firstScreen.width, firstScreen.height, 32, videoModeFlags); surface = SDL_SetVideoMode(firstScreen.width, firstScreen.height, 32, videoModeFlags);
SDL_putenv ("SDL_VIDEO_WINDOW_POS=none"); //stop linux from auto centering on resize
#endif #endif
@ -639,7 +640,7 @@ MA 02110-1301, USA.
GetClientRect(SDL_Window, &wDC); GetClientRect(SDL_Window, &wDC);
// change width only in 4 pixels steps! (see snapShot method) // change width in 4 pixels steps! (see snapShot method)
if (!fullScreen && (bounds.size.width != wDC.right - wDC.left if (!fullScreen && (bounds.size.width != wDC.right - wDC.left
|| bounds.size.height != wDC.bottom - wDC.top)) || bounds.size.height != wDC.bottom - wDC.top))
{ {
@ -669,9 +670,13 @@ MA 02110-1301, USA.
} }
else else
{ {
videoModeFlags |= SDL_RESIZABLE;; videoModeFlags |= SDL_RESIZABLE;
} }
surface = SDL_SetVideoMode((int)v_size.width, (int)v_size.height, 32, videoModeFlags); // change width in 4 pixels steps! (see snapShot method)
int w=viewSize.width;
if (w & 3) w = w + 4 - (w & 3);
viewSize.width=w;
surface = SDL_SetVideoMode((int)viewSize.width, (int)viewSize.height, 32, videoModeFlags);
bounds.size.width = surface->w; bounds.size.width = surface->w;
bounds.size.height = surface->h; bounds.size.height = surface->h;