Skip to content

Commit

Permalink
Events: minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Vultraz committed May 29, 2018
1 parent f72f89f commit eddbaa2
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/events.cpp
Expand Up @@ -473,7 +473,7 @@ void run_event_loop()
events.push_back(temp_event);
}

std::vector<SDL_Event>::iterator ev_it = events.begin();
auto ev_it = events.begin();
for(int i = 1; i < begin_ignoring; ++i) {
if(is_input(*ev_it)) {
// ignore user input events that occurred before the window was activated
Expand All @@ -483,14 +483,15 @@ void run_event_loop()
}
}

std::vector<SDL_Event>::iterator ev_end = events.end();
bool resize_found = false;
for(ev_it = events.begin(); ev_it != ev_end; ++ev_it) {
SDL_Event& event = *ev_it;
for(const SDL_Event& event : boost::adaptors::reverse(events)) {
if(event.type == SDL_WINDOWEVENT && event.window.event == SDL_WINDOWEVENT_RESIZED) {
resize_found = true;
last_resize_event = event;
last_resize_event_used = false;

// Since we're working backwards, the first resize event found is the last in the list.
break;
}
}

Expand All @@ -503,14 +504,11 @@ void run_event_loop()
last_resize_event_used = true;
}

ev_end = events.end();

for(ev_it = events.begin(); ev_it != ev_end; ++ev_it) {
for(const SDL_Event& event : events) {
for(context& c : event_contexts) {
c.add_staging_handlers();
}

SDL_Event& event = *ev_it;
switch(event.type) {
case SDL_WINDOWEVENT:
switch(event.window.event) {
Expand Down

0 comments on commit eddbaa2

Please sign in to comment.