From 41645a0eb594b3c847968642ee0bc13b5fc4e091 Mon Sep 17 00:00:00 2001 From: Pavel Grunt Date: Tue, 21 Apr 2015 18:37:16 +0200 Subject: [PATCH] virt-viewer-window: Make sure that minimum zoom level is lower than NORMAL_ZOOM_LEVEL The minimum size of the desktop is 100x100 if the minimum window size is greater than this, the zoom level is greater than NORMAL_ZOOM_LEVEL related: rhbz#1206460 --- src/virt-viewer-window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c index 29567c4..791ef23 100644 --- a/src/virt-viewer-window.c +++ b/src/virt-viewer-window.c @@ -1576,7 +1576,8 @@ virt_viewer_window_get_minimal_zoom_level(VirtViewerWindow *self) height_ratio = (double) min_height / height; zoom = ceil(10 * MAX(width_ratio, height_ratio)); - return MAX(MIN_ZOOM_LEVEL, zoom * ZOOM_STEP); + /* make sure that the returned zoom level is in the range from MIN_ZOOM_LEVEL to NORMAL_ZOOM_LEVEL */ + return CLAMP(zoom * ZOOM_STEP, MIN_ZOOM_LEVEL, NORMAL_ZOOM_LEVEL); } /*