commit ced9db1e38360e321007dd837fbb37d1d79d97d9
author george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Mon Sep 11 09:09:14 2006 +0000
committer george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Mon Sep 11 09:09:14 2006 +0000
tree d455fe3fc95ff7a8b4b3bc4578e70c3bf8da2c81
parent b6d87aa651fa5b06c03eb42f291f398233ff8a15

Fixed the bug with overlaping the vncviewer window all other
windows when it's in the fullscreen mode.
Small code improvements.

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

win/vncviewer/DesktopWindow.cxx

diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index 00f4c10..517d3ab 100644
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -270,7 +270,7 @@
     vlog.debug("flags=%x", flags);
 
     SetWindowLong(handle, GWL_STYLE, flags);
-    SetWindowPos(handle, HWND_TOPMOST, mi.rcMonitor.left, mi.rcMonitor.top,
+    SetWindowPos(handle, HWND_TOP, mi.rcMonitor.left, mi.rcMonitor.top,
       mi.rcMonitor.right-mi.rcMonitor.left,
       mi.rcMonitor.bottom-mi.rcMonitor.top,
       SWP_FRAMECHANGED);
@@ -424,7 +424,7 @@
         reqd_size.br.y += GetSystemMetrics(SM_CXHSCROLL);
 
       SetRect(&r, reqd_size.tl.x, reqd_size.tl.y, reqd_size.br.x, reqd_size.br.y);
-      if (tb.isVisible())
+      if (isToolbarEnabled())
         r.bottom += tb.getHeight();
       AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE);
       reqd_size = Rect(r.left, r.top, r.right, r.bottom);
@@ -932,7 +932,7 @@
     RECT r = {0, 0, w, h};
     AdjustWindowRectEx(&r, GetWindowLong(frameHandle, GWL_STYLE), FALSE,
                        GetWindowLong(frameHandle, GWL_EXSTYLE));
-    if (tb.isVisible())
+    if (isToolbarEnabled())
       r.bottom += tb.getHeight();
     AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE);