pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly center window on creation

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40924
This commit is contained in:
Patrice Mandin 2004-08-05 19:43:07 +00:00
parent d8a54a0f4a
commit a1135ef524
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/video/gem/SDL_gemvideo.c
View file

@ -644,20 +644,11 @@ SDL_Surface *GEM_SetVideoMode(_THIS, SDL_Surface *current,
modeflags |= SDL_SWSURFACE; modeflags |= SDL_SWSURFACE;
} }
} else { } else {
int posx,posy;
short x2,y2,w2,h2; short x2,y2,w2,h2;
GEM_UnlockScreen(this); GEM_UnlockScreen(this);
/* Center our window */ /* Set window gadgets */
posx = GEM_desk_x;
posy = GEM_desk_y;
if (width<GEM_desk_w)
posx += (GEM_desk_w - width) >> 1;
if (height<GEM_desk_h)
posy += (GEM_desk_h - height) >> 1;
/* Calculate our window size and position */
if (!(flags & SDL_NOFRAME)) { if (!(flags & SDL_NOFRAME)) {
GEM_win_type=NAME|MOVER|CLOSER|SMALLER; GEM_win_type=NAME|MOVER|CLOSER|SMALLER;
if (flags & SDL_RESIZABLE) { if (flags & SDL_RESIZABLE) {
@ -669,12 +660,17 @@ SDL_Surface *GEM_SetVideoMode(_THIS, SDL_Surface *current,
modeflags |= SDL_NOFRAME; modeflags |= SDL_NOFRAME;
} }
if (!wind_calc(WC_BORDER, GEM_win_type, posx, posy, width, height, &x2, &y2, &w2, &h2)) { /* Calculate window size */
if (!wind_calc(WC_BORDER, GEM_win_type, 0,0,width,height, &x2,&y2,&w2,&h2)) {
GEM_FreeBuffers(this); GEM_FreeBuffers(this);
SDL_SetError("Can not calculate window attributes\n"); SDL_SetError("Can not calculate window attributes\n");
return NULL; return NULL;
} }
/* Center window */
x2 = GEM_desk_x+((GEM_desk_w-w2)>>1);
y2 = GEM_desk_y+((GEM_desk_h-h2)>>1);
/* Create window */ /* Create window */
GEM_handle=wind_create(GEM_win_type, x2,y2,w2,h2); GEM_handle=wind_create(GEM_win_type, x2,y2,w2,h2);
if (GEM_handle<0) { if (GEM_handle<0) {