0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed event pump call from fullscreen helper functions in SDL2

Browse source
This commit is contained in:
Charles Dang 2015-12-23 04:04:08 +11:00
parent d4cd7d5a6d
commit 79012123b2
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/dialogs/lobby_main.cpp
View file

@ -440,23 +440,18 @@ static bool fullscreen(CVideo& video)
{
video.set_fullscreen(!preferences::fullscreen());
#if !SDL_VERSION_ATLEAST(2, 0, 0)
// Setting to fullscreen doesn't seem to generate a resize event.
const SDL_Rect& rect = screen_area();
SDL_Event event;
#if SDL_VERSION_ATLEAST(2, 0, 0)
event.type = SDL_WINDOWEVENT;
event.window.event = SDL_WINDOWEVENT_RESIZED;
event.window.data1 = rect.w;
event.window.data2 = rect.h;
#else
event.type = SDL_VIDEORESIZE;
event.resize.type = SDL_VIDEORESIZE;
event.resize.w = rect.w;
event.resize.h = rect.h;
#endif
SDL_PushEvent(&event);
#endif
return true;
}
@ -465,7 +460,7 @@ void tlobby_main::post_build(CVideo& video, twindow& window)
{
/** @todo Should become a global hotkey after 1.8, then remove it here. */
window.register_hotkey(hotkey::HOTKEY_FULLSCREEN,
boost::bind(fullscreen, boost::ref(video)));
boost::bind(fullscreen, boost::ref(video)));
/** @todo Remove this code once the resizing in twindow is finished. */

11
src/gui/dialogs/title_screen.cpp
View file

@ -171,23 +171,18 @@ static bool fullscreen(CVideo& video)
{
video.set_fullscreen(!preferences::fullscreen());
#if !SDL_VERSION_ATLEAST(2, 0, 0)
// Setting to fullscreen doesn't seem to generate a resize event.
const SDL_Rect& rect = screen_area();
SDL_Event event;
#if SDL_VERSION_ATLEAST(2, 0, 0)
event.type = SDL_WINDOWEVENT;
event.window.event = SDL_WINDOWEVENT_RESIZED;
event.window.data1 = rect.w;
event.window.data2 = rect.h;
#else
event.type = SDL_VIDEORESIZE;
event.resize.type = SDL_VIDEORESIZE;
event.resize.w = rect.w;
event.resize.h = rect.h;
#endif
SDL_PushEvent(&event);
#endif
return true;
}
@ -206,7 +201,7 @@ void ttitle_screen::post_build(CVideo& video, twindow& window)
boost::bind(&hotkey, boost::ref(window), RELOAD_GAME_DATA));
window.register_hotkey(hotkey::HOTKEY_FULLSCREEN,
boost::bind(fullscreen, boost::ref(video)));
boost::bind(fullscreen, boost::ref(video)));
window.register_hotkey(
hotkey::HOTKEY_LANGUAGE,