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

qt: port atomic_flag doresize from master

Browse Source
This commit is contained in:
ts-korhonen
2021-12-17 22:23:08 +02:00
parent 3825d5c53c
commit d3467568b0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/86box/plat.h
View File

@@ -66,16 +66,17 @@ extern int strnicmp(const char* s1, const char* s2, size_t n);
#ifdef __cplusplus #ifdef __cplusplus
#include <atomic> #include <atomic>
#define atomic_flag std::atomic_flag #define atomic_flag_t std::atomic_flag
extern "C" { extern "C" {
#else #else
#include <stdatomic.h> #include <stdatomic.h>
#define atomic_flag_t atomic_flag
#endif #endif
/* Global variables residing in the platform module. */ /* Global variables residing in the platform module. */
extern int dopause, /* system is paused */ extern int dopause, /* system is paused */
mouse_capture; /* mouse is captured in app */ mouse_capture; /* mouse is captured in app */
extern atomic_flag doresize; /* screen resize requested */ extern atomic_flag_t doresize; /* screen resize requested */
extern volatile int is_quit; /* system exit requested */ extern volatile int is_quit; /* system exit requested */
#ifdef MTR_ENABLED #ifdef MTR_ENABLED

3
src/qt/qt_main.cpp
View File

@@ -80,12 +80,11 @@ main_thread_fn()
} }
/* If needed, handle a screen resize. */ /* If needed, handle a screen resize. */
if (doresize && !video_fullscreen && !is_quit) { if (!atomic_flag_test_and_set(&doresize) && !video_fullscreen && !is_quit) {
if (vid_resize & 2) if (vid_resize & 2)
plat_resize(fixed_size_x, fixed_size_y); plat_resize(fixed_size_x, fixed_size_y);
else else
plat_resize(scrnsz_x, scrnsz_y); plat_resize(scrnsz_x, scrnsz_y);
doresize = 0;
} }
} }

2
src/qt/qt_mainwindow.cpp
View File

@@ -1067,7 +1067,7 @@ static void update_scaled_checkboxes(Ui::MainWindow* ui, QAction* selected) {
reset_screen_size(); reset_screen_size();
device_force_redraw(); device_force_redraw();
video_force_resize_set(1); video_force_resize_set(1);
doresize = 1; atomic_flag_clear(&doresize);
config_save(); config_save();
} }