80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix SDL2 fullscreen and make it borderless

Browse Source
This commit is contained in:
Cacodemon345
2021-08-29 23:45:11 +06:00
parent c5f563c76b
commit a56fa559e1
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/unix/unix_sdl.c
View File

@@ -149,7 +149,8 @@ sdl_blit(int x, int y, int y1, int y2, int w, int h)
if (resize_pending) if (resize_pending)
{ {
sdl_resize(resize_w, resize_h); if (video_fullscreen) SDL_RenderSetLogicalSize(sdl_render, resize_w, resize_h);
else sdl_resize(resize_w, resize_h);
resize_pending = 0; resize_pending = 0;
} }
r_src.x = 0; r_src.x = 0;
@@ -262,7 +263,6 @@ sdl_reinit_texture()
sdl_destroy_texture(); sdl_destroy_texture();
SDL_GL_SetAttribute(SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1);
if (sdl_flags & RENDERER_HARDWARE) { if (sdl_flags & RENDERER_HARDWARE) {
sdl_render = SDL_CreateRenderer(sdl_win, -1, SDL_RENDERER_ACCELERATED); sdl_render = SDL_CreateRenderer(sdl_win, -1, SDL_RENDERER_ACCELERATED);
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, video_filter_method ? "1" : "0"); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, video_filter_method ? "1" : "0");
@@ -277,9 +277,7 @@ void
sdl_set_fs(int fs) sdl_set_fs(int fs)
{ {
SDL_LockMutex(sdl_mutex); SDL_LockMutex(sdl_mutex);
sdl_enabled = 0; SDL_SetWindowFullscreen(sdl_win, fs ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
sdl_destroy_texture();
SDL_SetWindowFullscreen(sdl_win, fs ? SDL_WINDOW_FULLSCREEN : 0);
SDL_SetRelativeMouseMode((SDL_bool)mouse_capture); SDL_SetRelativeMouseMode((SDL_bool)mouse_capture);
sdl_fs = fs; sdl_fs = fs;
@@ -290,7 +288,6 @@ sdl_set_fs(int fs)
sdl_flags &= ~RENDERER_FULL_SCREEN; sdl_flags &= ~RENDERER_FULL_SCREEN;
sdl_reinit_texture(); sdl_reinit_texture();
sdl_enabled = 1;
SDL_UnlockMutex(sdl_mutex); SDL_UnlockMutex(sdl_mutex);
} }
@@ -370,7 +367,7 @@ sdl_init_common(int flags)
sdl_mutex = SDL_CreateMutex(); sdl_mutex = SDL_CreateMutex();
sdl_win = SDL_CreateWindow("86Box", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, scrnsz_x, scrnsz_y, SDL_WINDOW_OPENGL); sdl_win = SDL_CreateWindow("86Box", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, scrnsz_x, scrnsz_y, SDL_WINDOW_OPENGL);
sdl_set_fs(video_fullscreen & 1); sdl_set_fs(video_fullscreen);
if (!(video_fullscreen & 1)) if (!(video_fullscreen & 1))
{ {
if (vid_resize & 2) if (vid_resize & 2)