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

virt-viewer-window: cleanup zoom handling

Browse Source 
We've 3 similar zoom function zoom in / out / reset. in / out do not
schedule a window resize when there is no display, where as reset does,
which is not consistent. Also there is some duplicate code between them.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2013-04-22 16:08:33 +02:00
parent f0a103fa86
commit 24182b5be8
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,46 +355,21 @@ G_MODULE_EXPORT void
virt_viewer_window_menu_view_zoom_out(GtkWidget *menu G_GNUC_UNUSED,
VirtViewerWindow *self)
{
VirtViewerWindowPrivate *priv = self->priv;
if (priv->zoomlevel > 10)
priv->zoomlevel -= 10;
if (!priv->display)
return;
gtk_window_resize(GTK_WINDOW(priv->window), 1, 1);
if (priv->display)
virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel);
virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel - 10);
}
G_MODULE_EXPORT void
virt_viewer_window_menu_view_zoom_in(GtkWidget *menu G_GNUC_UNUSED,
VirtViewerWindow *self)
{
VirtViewerWindowPrivate *priv = self->priv;
if (priv->zoomlevel < 400)
priv->zoomlevel += 10;
if (!priv->display)
return;
gtk_window_resize(GTK_WINDOW(priv->window), 1, 1);
if (priv->display)
virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel);
virt_viewer_window_set_zoom_level(self, self->priv->zoomlevel + 10);
}
G_MODULE_EXPORT void
virt_viewer_window_menu_view_zoom_reset(GtkWidget *menu G_GNUC_UNUSED,
VirtViewerWindow *self)
{
VirtViewerWindowPrivate *priv = self->priv;
gtk_window_resize(GTK_WINDOW(priv->window), 1, 1);
priv->zoomlevel = 100;
if (priv->display)
virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel);
virt_viewer_window_set_zoom_level(self, 100);
}
/*
@ -1203,10 +1178,23 @@ virt_viewer_window_hide(VirtViewerWindow *self)
void
virt_viewer_window_set_zoom_level(VirtViewerWindow *self, gint zoom_level)
{
g_return_if_fail(VIRT_VIEWER_IS_WINDOW(self));
VirtViewerWindowPrivate *priv;
/* FIXME: turn into a dynamic property */
self->priv->zoomlevel = zoom_level;
g_return_if_fail(VIRT_VIEWER_IS_WINDOW(self));
priv = self->priv;
if (zoom_level < 10)
zoom_level = 10;
if (zoom_level > 400)
zoom_level = 400;
priv->zoomlevel = zoom_level;
if (!priv->display)
return;
gtk_window_resize(GTK_WINDOW(priv->window), 1, 1);
virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel);
}
gint virt_viewer_window_get_zoom_level(VirtViewerWindow *self)