From 9bd640e1a0628215d8200143d8b39a65aee3f23d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 6 Oct 2015 21:16:21 -0700 Subject: [PATCH] Fixed sending a size event while setting up a window (fix for DOTA 2 on Source 2) --- src/video/windows/SDL_windowsevents.c | 2 +- src/video/windows/SDL_windowswindow.c | 3 +++ src/video/windows/SDL_windowswindow.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c index 8f3ec68553986..87d4e6024d985 100644 --- a/src/video/windows/SDL_windowsevents.c +++ b/src/video/windows/SDL_windowsevents.c @@ -735,7 +735,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) int x, y; int w, h; - if (data->in_border_change) { + if (data->initializing || data->in_border_change) { break; } diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c index a1fb020c81931..26db698d7fa46 100644 --- a/src/video/windows/SDL_windowswindow.c +++ b/src/video/windows/SDL_windowswindow.c @@ -130,6 +130,7 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created) data->created = created; data->mouse_button_flags = 0; data->videodata = videodata; + data->initializing = SDL_TRUE; window->driverdata = data; @@ -255,6 +256,8 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created) /* Enable dropping files */ DragAcceptFiles(hwnd, TRUE); + data->initializing = SDL_FALSE; + /* All done! */ return 0; } diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h index 32ce279ed45ff..ede1e1ece4981 100644 --- a/src/video/windows/SDL_windowswindow.h +++ b/src/video/windows/SDL_windowswindow.h @@ -37,6 +37,7 @@ typedef struct WNDPROC wndproc; SDL_bool created; WPARAM mouse_button_flags; + SDL_bool initializing; SDL_bool expected_resize; SDL_bool in_border_change; SDL_bool in_title_click;