commit 74ea5f3cd7a1bb6b2e3d865def15ebf44416cbc8
author george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Mon Sep 11 11:40:12 2006 +0000
committer george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Mon Sep 11 11:40:12 2006 +0000
tree 9802b15bf884708740e9253b947c09de10ccc040
parent ced9db1e38360e321007dd837fbb37d1d79d97d9

Now status of ZOOM IN, ZOOM OUT, ACTUAL SIZE, AUTO SIZE
toolbar buttons depend on scale values and scale mode
(scale, auto scale).

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@662 3789f03b-4d11-0410-bbf8-ca57d06f2519

win/vncviewer/CConn.cxx

diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 388014f..0d95180 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -223,8 +223,9 @@
     window->setDesktopScale(100);
     return true;
   case IDM_AUTO_SIZE:
-    options.autoScaling = true;
-    window->setAutoScaling(true);
+    options.autoScaling = !options.autoScaling;
+    window->setAutoScaling(options.autoScaling);
+    if (!options.autoScaling) options.scale = window->getDesktopScale();
     return true;
   case IDM_SHOW_TOOLBAR:
     options.showToolbar = !window->isToolbarEnabled();