Merge branch 'master' into dev

This commit is contained in:
Romain Vimont
2018-03-28 10:45:23 +02:00
2 changed files with 12 additions and 8 deletions

View File

@@ -247,10 +247,11 @@ void input_manager_process_mouse_button(struct input_manager *input_manager,
SDL_bool outside_device_screen =
event->x < 0 || event->x >= input_manager->screen->frame_size.width ||
event->y < 0 || event->y >= input_manager->screen->frame_size.height;
if (outside_device_screen) {
screen_resize_to_fit(input_manager->screen);
}
return;
if (outside_device_screen) {
screen_resize_to_fit(input_manager->screen);
return;
}
// otherwise, send the click event to the device
}
};
struct control_event control_event;