From c8c921caf59c7b444eae9d786aebcc31bb93d4c7 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Wed, 6 Nov 2019 19:15:30 +0100 Subject: [PATCH] Remove HIDPI compilation flag The flag had been added to avoid hidpi bugs. A workaround will be implemented for these bugs, so the flag is not needed anymore. --- app/meson.build | 3 --- app/src/screen.c | 7 +++---- meson_options.txt | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/meson.build b/app/meson.build index 145e0ef6..292e9012 100644 --- a/app/meson.build +++ b/app/meson.build @@ -109,9 +109,6 @@ conf.set('DEFAULT_MAX_SIZE', '0') # 0: unlimited # overridden by option --bit-rate conf.set('DEFAULT_BIT_RATE', '8000000') # 8Mbps -# enable High DPI support -conf.set('HIDPI_SUPPORT', get_option('hidpi_support')) - # disable console on Windows conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole')) diff --git a/app/src/screen.c b/app/src/screen.c index f90863dd..4846922c 100644 --- a/app/src/screen.c +++ b/app/src/screen.c @@ -140,10 +140,9 @@ screen_init_rendering(struct screen *screen, const char *window_title, screen->frame_size = frame_size; struct size window_size = get_initial_optimal_size(frame_size); - uint32_t window_flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE; -#ifdef HIDPI_SUPPORT - window_flags |= SDL_WINDOW_ALLOW_HIGHDPI; -#endif + uint32_t window_flags = SDL_WINDOW_HIDDEN + | SDL_WINDOW_RESIZABLE + | SDL_WINDOW_ALLOW_HIGHDPI; if (always_on_top) { #ifdef SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP window_flags |= SDL_WINDOW_ALWAYS_ON_TOP; diff --git a/meson_options.txt b/meson_options.txt index 4cf4a8bf..eb7a31f7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,5 +4,4 @@ option('crossbuild_windows', type: 'boolean', value: false, description: 'Build option('windows_noconsole', type: 'boolean', value: false, description: 'Disable console on Windows (pass -mwindows flag)') option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server') option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable') -option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support') option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')