mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

better window resizing in SDL2

This commit is contained in:
Zeno Rogue 2021-03-09 09:45:33 +01:00
parent 1c36c876ba
commit 353af95596
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
basegraph.cpp
View File

@ -1143,13 +1143,19 @@ EX bool need_to_apply_screen_settings() {
EX void close_renderer() {
#if CAP_SDL2
if(s_renderer) SDL_DestroyRenderer(s_renderer), s_renderer = nullptr;
if(s_window) SDL_DestroyWindow(s_window), s_window = nullptr;
if(s_texture) SDL_DestroyTexture(s_texture), s_texture = nullptr;
if(s) SDL_FreeSurface(s), s = nullptr;
if(s_software_renderer) SDL_DestroyRenderer(s_software_renderer), s_software_renderer = nullptr;
#endif
}
EX void close_window() {
#if CAP_SDL2
close_renderer();
if(s_window) SDL_DestroyWindow(s_window), s_window = nullptr;
#endif
}
EX void apply_screen_settings() {
if(!need_to_apply_screen_settings()) return;
if(!graphics_on) return;
@ -1160,7 +1166,6 @@ EX void apply_screen_settings() {
#endif
close_renderer();
close_font();
#if CAP_VR
if(vrhr::state) vrhr::shutdown_vr();
#endif
@ -1169,7 +1174,6 @@ EX void apply_screen_settings() {
graphics_on = false;
android_settings_changed();
init_graph();
init_font();
if(vid.usingGL) {
glhr::be_textured(); glhr::be_nontextured();
}
@ -1194,6 +1198,8 @@ EX pair<int, int> get_requested_resolution() {
EX bool resizable = true;
EX int current_window_flags = -1;
EX void setvideomode() {
DEBBI(DF_INIT | DF_GRAPH, ("setvideomode"));
@ -1258,11 +1264,16 @@ EX void setvideomode() {
auto create_win = [&] {
#if CAP_SDL2
if(s_window) SDL_DestroyWindow(s_window), s_window = nullptr;
s_window = SDL_CreateWindow(CUSTOM_CAPTION, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
if(s_window && current_window_flags != (flags | sizeflag))
SDL_DestroyWindow(s_window), s_window = nullptr;
if(s_window)
SDL_SetWindowSize(s_window, vid.xres, vid.yres);
else
s_window = SDL_CreateWindow(CUSTOM_CAPTION, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
vid.xres, vid.yres,
flags | sizeflag
);
current_window_flags = (flags | sizeflag);
#else
s = SDL_SetVideoMode(vid.xres, vid.yres, 32, flags | sizeflag);
#endif
@ -1292,6 +1303,7 @@ EX void setvideomode() {
#if CAP_SDL2
s_renderer = SDL_CreateRenderer(s_window, -1, vid.current_vsync ? SDL_RENDERER_PRESENTVSYNC : 0);
SDL_GetRendererOutputSize(s_renderer, &vid.xres, &vid.yres);
if(s_texture) SDL_DestroyTexture(s_texture), s_texture = nullptr;
s_texture = SDL_CreateTexture(s_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, vid.xres, vid.yres);
@ -1465,7 +1477,7 @@ EX void quit_all() {
closeJoysticks();
#endif
#if CAP_SDL
close_renderer();
close_window();
SDL_Quit();
sdl_on = false;
#endif