diff options
author | Pavel Grunt <pgrunt@redhat.com> | 2015-05-26 14:49:56 +0200 |
---|---|---|
committer | Pavel Grunt <pgrunt@redhat.com> | 2015-05-26 15:21:33 +0200 |
commit | cbe1759654084cef1dbf3f371fae43ec9f5c053e (patch) | |
tree | c9cefc65b68aee71643524dd4c89ba11582b2ae0 | |
parent | 596aea6912ea8c536cfab002688cc1634cbe0737 (diff) |
virt-viewer-window: Change zoom with respect to real zoomwrong_zoom
-rw-r--r-- | src/virt-viewer-window.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c index d67fbc1..5123e43 100644 --- a/src/virt-viewer-window.c +++ b/src/virt-viewer-window.c @@ -368,19 +368,32 @@ virt_viewer_window_desktop_resize(VirtViewerDisplay *display G_GNUC_UNUSED, virt_viewer_window_resize(self, FALSE); } +static gint +virt_viewer_window_get_real_zoom_level(VirtViewerWindow *self) +{ + GtkAllocation allocation; + guint width, height; + + gtk_widget_get_allocation(GTK_WIDGET(self->priv->display), &allocation); + virt_viewer_display_get_desktop_size(self->priv->display, &width, &height); + + return round((double) NORMAL_ZOOM_LEVEL * allocation.width / width); +} G_MODULE_EXPORT void virt_viewer_window_menu_view_zoom_out(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { - virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel - ZOOM_STEP); + virt_viewer_window_set_zoom_level(self, + virt_viewer_window_get_real_zoom_level(self) - ZOOM_STEP); } G_MODULE_EXPORT void virt_viewer_window_menu_view_zoom_in(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { - virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel + ZOOM_STEP); + virt_viewer_window_set_zoom_level(self, + virt_viewer_window_get_real_zoom_level(self) + ZOOM_STEP); } G_MODULE_EXPORT void @@ -1471,7 +1484,7 @@ virt_viewer_window_set_zoom_level(VirtViewerWindow *self, gint zoom_level) priv->zoomlevel = min_zoom; } - if (priv->zoomlevel == virt_viewer_display_get_zoom_level(priv->display)) { + if (priv->zoomlevel == virt_viewer_window_get_real_zoom_level(self)) { g_debug("Zoom level not changed, using: %d", priv->zoomlevel); return; } |