diff options
| author | rbuj <[email protected]> | 2021-12-12 11:39:14 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2022-03-11 18:54:19 +0100 |
| commit | 5e8097475ba237bc0bc71ad78a7cbdf2d71f7b87 (patch) | |
| tree | 178f99b087d96213a85ac3bdff7e01a2cff5cb92 /src/core/screen.c | |
| parent | 480cc60e3b3596a7fa8e196a08974b6086217bf0 (diff) | |
| download | marco-5e8097475ba237bc0bc71ad78a7cbdf2d71f7b87.tar.bz2 marco-5e8097475ba237bc0bc71ad78a7cbdf2d71f7b87.tar.xz | |
Fix some -Wfloat-conversion warnings
Diffstat (limited to 'src/core/screen.c')
| -rw-r--r-- | src/core/screen.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/screen.c b/src/core/screen.c index c5962cb2..99932393 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -1214,7 +1214,7 @@ meta_screen_update_cursor (MetaScreen *screen) } #define MAX_PREVIEW_SCREEN_FRACTION 0.33 -#define MAX_PREVIEW_SIZE 300 +#define MAX_PREVIEW_SIZE 300.0 static cairo_surface_t * get_window_surface (MetaWindow *window) @@ -1222,7 +1222,8 @@ get_window_surface (MetaWindow *window) cairo_surface_t *surface, *scaled; cairo_t *cr; const MetaXineramaScreenInfo *current; - int width, height, max_columns, max_size; + int width, height, max_columns; + double max_size; double ratio; surface = meta_compositor_get_window_surface (window->display->compositor, window); @@ -1239,14 +1240,14 @@ get_window_surface (MetaWindow *window) /* Scale surface to fit current screen */ if (width > height) { - max_size = MIN (MAX_PREVIEW_SIZE, current->rect.width / max_columns * MAX_PREVIEW_SCREEN_FRACTION); + max_size = MIN (MAX_PREVIEW_SIZE, MAX_PREVIEW_SCREEN_FRACTION * ((double) current->rect.width) / ((double) max_columns)); ratio = ((double) width) / max_size; width = (int) max_size; height = (int) (((double) height) / ratio); } else { - max_size = MIN (MAX_PREVIEW_SIZE, current->rect.height / max_columns * MAX_PREVIEW_SCREEN_FRACTION); + max_size = MIN (MAX_PREVIEW_SIZE, MAX_PREVIEW_SCREEN_FRACTION * ((double) current->rect.height) / ((double) max_columns)); ratio = ((double) height) / max_size; height = (int) max_size; width = (int) (((double) width) / ratio); |