Define the min/max zoom levels, so all values are sync

This commit is contained in:
Marc-André Lureau 2013-08-20 13:43:52 +02:00
parent 980de2d331
commit 563067341c
3 changed files with 11 additions and 8 deletions

View File

@ -1430,8 +1430,8 @@ virt_viewer_app_init (VirtViewerApp *self)
g_clear_error(&error);
if (opt_zoom < 10 || opt_zoom > 200) {
g_printerr(_("Zoom level must be within 10-200\n"));
if (opt_zoom < MIN_ZOOM_LEVEL || opt_zoom > MAX_ZOOM_LEVEL) {
g_printerr(_("Zoom level must be within %d-%d\n"), MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL);
opt_zoom = 100;
}

View File

@ -144,8 +144,8 @@ virt_viewer_display_class_init(VirtViewerDisplayClass *class)
g_param_spec_int("zoom-level",
"Zoom",
"Zoom level",
10,
400,
MIN_ZOOM_LEVEL,
MAX_ZOOM_LEVEL,
100,
G_PARAM_READWRITE));
@ -577,10 +577,10 @@ void virt_viewer_display_set_zoom_level(VirtViewerDisplay *display,
{
VirtViewerDisplayPrivate *priv = display->priv;
if (zoom < 10)
zoom = 10;
if (zoom > 400)
zoom = 400;
if (zoom < MIN_ZOOM_LEVEL)
zoom = MIN_ZOOM_LEVEL;
if (zoom > MAX_ZOOM_LEVEL)
zoom = MAX_ZOOM_LEVEL;
priv->zoom_level = zoom;
virt_viewer_display_queue_resize(display);

View File

@ -30,6 +30,9 @@
G_BEGIN_DECLS
#define MIN_ZOOM_LEVEL 10
#define MAX_ZOOM_LEVEL 400
#define VIRT_VIEWER_TYPE_WINDOW virt_viewer_window_get_type()
#define VIRT_VIEWER_WINDOW(obj) \