summaryrefslogtreecommitdiff
path: root/Source/3rdParty/SDL2/src/events/SDL_windowevents.c
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-31 18:38:35 +0800
committerchai <chaifix@163.com>2019-01-31 18:38:35 +0800
commit2ec55fd974a63b705a4777c256d2222c874fa043 (patch)
tree48f1fea59ee9fc713a28a9aac3f05b98dc5ae66f /Source/3rdParty/SDL2/src/events/SDL_windowevents.c
parentc581dfbf1e849f393861d15e82aa6446c0c1c310 (diff)
*SDL project
Diffstat (limited to 'Source/3rdParty/SDL2/src/events/SDL_windowevents.c')
-rw-r--r--Source/3rdParty/SDL2/src/events/SDL_windowevents.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/Source/3rdParty/SDL2/src/events/SDL_windowevents.c b/Source/3rdParty/SDL2/src/events/SDL_windowevents.c
index 610fad5..1670841 100644
--- a/Source/3rdParty/SDL2/src/events/SDL_windowevents.c
+++ b/Source/3rdParty/SDL2/src/events/SDL_windowevents.c
@@ -25,30 +25,16 @@
#include "SDL_events.h"
#include "SDL_events_c.h"
#include "SDL_mouse_c.h"
-#include "../video/SDL_sysvideo.h"
static int SDLCALL
-RemovePendingResizedEvents(void * userdata, SDL_Event *event)
+RemovePendingSizeChangedAndResizedEvents(void * userdata, SDL_Event *event)
{
SDL_Event *new_event = (SDL_Event *)userdata;
if (event->type == SDL_WINDOWEVENT &&
- event->window.event == SDL_WINDOWEVENT_RESIZED &&
- event->window.windowID == new_event->window.windowID) {
- /* We're about to post a new size event, drop the old one */
- return 0;
- }
- return 1;
-}
-
-static int SDLCALL
-RemovePendingSizeChangedEvents(void * userdata, SDL_Event *event)
-{
- SDL_Event *new_event = (SDL_Event *)userdata;
-
- if (event->type == SDL_WINDOWEVENT &&
- event->window.event == SDL_WINDOWEVENT_SIZE_CHANGED &&
+ (event->window.event == SDL_WINDOWEVENT_SIZE_CHANGED ||
+ event->window.event == SDL_WINDOWEVENT_RESIZED) &&
event->window.windowID == new_event->window.windowID) {
/* We're about to post a new size event, drop the old one */
return 0;
@@ -200,11 +186,8 @@ SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1,
event.window.windowID = window->id;
/* Fixes queue overflow with resize events that aren't processed */
- if (windowevent == SDL_WINDOWEVENT_RESIZED) {
- SDL_FilterEvents(RemovePendingResizedEvents, &event);
- }
if (windowevent == SDL_WINDOWEVENT_SIZE_CHANGED) {
- SDL_FilterEvents(RemovePendingSizeChangedEvents, &event);
+ SDL_FilterEvents(RemovePendingSizeChangedAndResizedEvents, &event);
}
if (windowevent == SDL_WINDOWEVENT_MOVED) {
SDL_FilterEvents(RemovePendingMoveEvents, &event);