diff options
| author | Pavel Grunt <pgrunt@redhat.com> | 2015-04-21 18:37:16 +0200 |
|---|---|---|
| committer | Pavel Grunt <pgrunt@redhat.com> | 2015-04-22 15:20:05 +0200 |
| commit | 41645a0eb594b3c847968642ee0bc13b5fc4e091 (patch) | |
| tree | a7d127c208e4001e92b1c52ecad997533da83eff /src/virt-viewer-window.c | |
| parent | 82d6280e5c60b70c69dbeb055af55acd51fe61c5 (diff) | |
| download | virt-viewer-41645a0eb594b3c847968642ee0bc13b5fc4e091.tar.gz virt-viewer-41645a0eb594b3c847968642ee0bc13b5fc4e091.tar.xz virt-viewer-41645a0eb594b3c847968642ee0bc13b5fc4e091.zip | |
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
Diffstat (limited to 'src/virt-viewer-window.c')
| -rw-r--r-- | src/virt-viewer-window.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } /* |