mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-03 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Turn scale factor into float for better precision

Browse source
This commit is contained in:
Shaoxing Wang 2018-09-05 23:26:13 +08:00
commit a5e690d2a0
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/screen.c
View file

@ -65,23 +65,23 @@ static void set_window_size(struct screen *screen, struct size new_size) {
} }
} }
void get_window_scale(SDL_Window *window, int *scale_x, int *scale_y) { void get_window_scale(SDL_Window *window, float *scale_x, float *scale_y) {
int win_w, win_h; int win_w, win_h;
SDL_GetWindowSize(window, &win_w, &win_h); SDL_GetWindowSize(window, &win_w, &win_h);
int output_w, output_h; int output_w, output_h;
SDL_GL_GetDrawableSize(window, &output_w, &output_h); SDL_GL_GetDrawableSize(window, &output_w, &output_h);
*scale_x = output_w / win_w; *scale_x = (float)output_w / win_w;
*scale_y = output_h / win_h; *scale_y = (float)output_h / win_h;
} }
SDL_bool screen_update_logical_size_if_needed(struct screen *screen) { SDL_bool screen_update_logical_size_if_needed(struct screen *screen) {
int scale_x, scale_y; float scale_x, scale_y;
get_window_scale(screen->window, &scale_x, &scale_y); get_window_scale(screen->window, &scale_x, &scale_y);
if (scale_x != screen->scale_x || scale_y != screen->scale_y) { if (scale_x != screen->scale_x || scale_y != screen->scale_y) {
int logical_width, logical_height; int logical_width, logical_height;
SDL_RenderGetLogicalSize(screen->renderer, &logical_width, &logical_height); SDL_RenderGetLogicalSize(screen->renderer, &logical_width, &logical_height);
logical_width *= (float)scale_x / screen->scale_x; logical_width *= scale_x / screen->scale_x;
logical_height *= (float)scale_y / screen->scale_y; logical_height *= scale_y / screen->scale_y;
screen->scale_x = scale_x; screen->scale_x = scale_x;
screen->scale_y = scale_y; screen->scale_y = scale_y;
if (SDL_RenderSetLogicalSize(screen->renderer, logical_width, logical_height)) { if (SDL_RenderSetLogicalSize(screen->renderer, logical_width, logical_height)) {

6
app/src/screen.h
View file

@ -12,8 +12,8 @@ struct screen {
SDL_Renderer *renderer; SDL_Renderer *renderer;
SDL_Texture *texture; SDL_Texture *texture;
struct size frame_size; struct size frame_size;
int scale_x; float scale_x;
int scale_y; float scale_y;
//used only in fullscreen mode to know the windowed window size //used only in fullscreen mode to know the windowed window size
struct size windowed_window_size; struct size windowed_window_size;
SDL_bool has_frame; SDL_bool has_frame;
@ -68,7 +68,7 @@ void screen_resize_to_fit(struct screen *screen);
// resize window to 1:1 (pixel-perfect) // resize window to 1:1 (pixel-perfect)
void screen_resize_to_pixel_perfect(struct screen *screen); void screen_resize_to_pixel_perfect(struct screen *screen);
void get_window_scale(SDL_Window *window, int *scale_x, int *scale_y); void get_window_scale(SDL_Window *window, float *scale_x, float *scale_y);
SDL_bool screen_update_logical_size_if_needed(struct screen *screen); SDL_bool screen_update_logical_size_if_needed(struct screen *screen);