Small the DesktopWindow class code improvements.

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

diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index 8460f58183b098aa641011aca30e48d256475860..197449d21f8ad0f49da005729cedc460cdd77a31 100644 (file)
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -973,8 +973,8 @@ void DesktopWindow::setAutoScaling(bool as) {
   if (as) fitBufferToWindow();
 }
 
-void DesktopWindow::setDesktopScale(int scale) {
-  buffer->setScale(scale);
+void DesktopWindow::setDesktopScaleRatio(double scale_ratio) {
+  buffer->setScaleRatio(scale_ratio);
   InvalidateRect(frameHandle, 0, FALSE);
   calculateScrollBars();
   if (isToolbarEnabled()) refreshToolbarButtons();
@@ -998,9 +998,7 @@ void DesktopWindow::fitBufferToWindow(bool repaint) {
   } else { 
     scale_ratio = double(client_size.width()) / buffer->getSrcWidth();
   }
-  buffer->setScaleRatio(scale_ratio);
-  if (repaint) InvalidateRect(frameHandle, 0, TRUE);
-  if (isToolbarEnabled()) refreshToolbarButtons();
+  setDesktopScaleRatio(scale_ratio);
 }
 
 void

diff --git a/win/vncviewer/DesktopWindow.h b/win/vncviewer/DesktopWindow.h
index e8f87bc6b1a01e37d3eed9d8bebfc6798ff3df5a..9c2f1f3e2310241802f30f95f3088b2bd07558af 100644 (file)
--- a/win/vncviewer/DesktopWindow.h
+++ b/win/vncviewer/DesktopWindow.h
@@ -84,7 +84,8 @@ namespace rfb {
       void setColour(int i, int r, int g, int b) {buffer->setColour(i, r, g, b);}
       void setAutoScaling(bool as);
       bool isAutoScaling() const { return autoScaling; }
-      void setDesktopScale(int scale);
+      void setDesktopScaleRatio(double scale_ratio);
+      void setDesktopScale(int scale) { setDesktopScaleRatio(double(scale)/100); }
       int  getDesktopScale() const { return buffer->getScale(); }
       void fitBufferToWindow(bool repaint = true);