Fixed the bug with the main window resizing (don't take

the toolbar height into calculation of the main window
size).

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

diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index d4bc3e76cdf294d6b2622c704428a8644e35367c..f96c7e44741d25f3baad73b1b31f5114cbb6d871 100644 (file)
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -301,6 +301,8 @@ void DesktopWindow::setFullscreen(bool fs) {
 void DesktopWindow::setShowToolbar(bool st)
 {
   showToolbar = st;
+  if (fullscreenActive) return;
+
   RECT r;
   GetWindowRect(handle, &r);
   bool maximized = GetWindowLong(handle, GWL_STYLE) & WS_MAXIMIZE;