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

Don't crash when resizing non-shaped windows

Browse source
This commit is contained in:
Sam Lantinga 2010-12-31 08:50:06 -08:00
parent b0b0c5e0e9
commit 56d603e6e1
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/video/cocoa/SDL_cocoawindow.m
View file

@ -117,7 +117,8 @@ static __inline__ void ConvertNSRect(NSRect *r)
NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]]; NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
w = (int)rect.size.width; w = (int)rect.size.width;
h = (int)rect.size.height; h = (int)rect.size.height;
Cocoa_ResizeWindowShape(_data->window); if (SDL_IsShapedWindow(_data->window))
Cocoa_ResizeWindowShape(_data->window);
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h); SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h);
} }

2
src/video/x11/SDL_x11window.c
View file

@ -942,7 +942,7 @@ X11_SetWindowSize(_THIS, SDL_Window * window)
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
Display *display = data->videodata->display; Display *display = data->videodata->display;
if(SDL_IsShapedWindow(window)) if (SDL_IsShapedWindow(window))
X11_ResizeWindowShape(window); X11_ResizeWindowShape(window);
XResizeWindow(display, data->xwindow, window->w, window->h); XResizeWindow(display, data->xwindow, window->w, window->h);
} }