commit 4a185b007b3ee78408cae55327441d867954c200
author george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Mon Mar 12 14:26:33 2007 +0000
committer george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Mon Mar 12 14:26:33 2007 +0000
tree 60033c12c19dc6f7e5905eff97cd5534661ac159
parent 770bbbc492bc23c59e8b75d00ded6bd5ef926ce7

Fixed the small defect with refreshing the toolbar buttons (now always enable actual size button when vncviewer works in the autoscaling mode).

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

win/vncviewer/DesktopWindow.cxx

diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index c7c6e61..b0bebaf 100644
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -324,8 +324,6 @@
 
 void DesktopWindow::refreshToolbarButtons() {
   int scale = getDesktopScale();
-  if (scale == 100) tb.enableButton(ID_ACTUAL_SIZE, false);
-  else tb.enableButton(ID_ACTUAL_SIZE, true);
   if (scale <= 10) {
     tb.enableButton(ID_ZOOM_IN, true);
     tb.enableButton(ID_ZOOM_OUT, false);
@@ -336,6 +334,8 @@
     tb.enableButton(ID_ZOOM_IN, true);
     tb.enableButton(ID_ZOOM_OUT, true);
   }
+  if (buffer->isScaling() || isAutoScaling()) tb.enableButton(ID_ACTUAL_SIZE, true);
+  else tb.enableButton(ID_ACTUAL_SIZE, false);
   if (isAutoScaling()) tb.pressButton(ID_AUTO_SIZE, true);
   else tb.pressButton(ID_AUTO_SIZE, false);
 }