pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 23:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virt-viewer-window: Change zoom with respect to real zoom

Browse Source 
The zoom can be changed by resizing the window (VNC / Spice without
the agent). It is necessary to recalculate the zoom level before
changing it, otherwise zoom operations will not work correctly.

Resolves:
https://bugs.freedesktop.org/show_bug.cgi?id=90582
This commit is contained in:
Pavel Grunt 2015-05-26 14:49:56 +02:00
parent ae7ce62f1b
commit 0d81ec2ef8
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/virt-viewer-window.c
View File

@ -368,19 +368,32 @@ virt_viewer_window_desktop_resize(VirtViewerDisplay *display G_GNUC_UNUSED,
virt_viewer_window_queue_resize(self);
}
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
@ -1397,7 +1410,8 @@ 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_display_get_zoom_level(priv->display) &&
priv->zoomlevel == virt_viewer_window_get_real_zoom_level(self)) {
g_debug("Zoom level not changed, using: %d", priv->zoomlevel);
return;
}