From 1a2371fcd2e46b8b0134f65966357fb3eb3a3efb Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Fri, 29 Apr 2011 14:04:40 -0500 Subject: [PATCH] include/canvas.js: missed scale fix. --- include/canvas.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/canvas.js b/include/canvas.js index b56a4241..ad273fbb 100644 --- a/include/canvas.js +++ b/include/canvas.js @@ -38,7 +38,7 @@ cdef('target', 'dom', null, 'Canvas element for VNC viewport'); cdef('focusContainer', 'dom', document, 'DOM element that traps keyboard input'); cdef('true_color', 'bool', true, 'Request true color pixel data'); cdef('colourMap', 'raw', [], 'Colour map array (not true color)'); -cdef('scale', 'float', 1.0, 'Viewport scale factor 0.0 - 1.0'); +cdef('scale', 'float', 1.0, 'Viewport scale factor 0.1 - 1.0'); cdef('render_mode', 'str', '', 'Canvas rendering mode (read-only)'); @@ -235,6 +235,12 @@ that.rescale = function(factor) { return; } + if (factor > 1.0) { + factor = 1.0; + } else if (factor < 0.1) { + factor = 0.1; + } + if (conf.scale === factor) { //Util.Debug("Canvas already scaled to '" + factor + "'"); return;