[X2Go-Commits] [x2goclient] 01/01: Fix "fullscreen" mode on Windows 7 with several monitors.
git-admin at x2go.org
git-admin at x2go.org
Wed Jul 2 15:35:31 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit f8464c490c9d311a59db5159403f3ccd8afc40a5
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date: Wed Jul 2 15:35:26 2014 +0200
Fix "fullscreen" mode on Windows 7 with several monitors.
---
debian/changelog | 1 +
wapi.cpp | 26 ++++++++++++++------------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 53819d5..8b6a5e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,7 @@ x2goclient (4.0.2.1-0x2go1) UNRELEASED; urgency=low
- Update russian translation.
- Update string "&Clipboard Mode" and translate in russian translation file.
- Grammar fix in russian translation.
+ - Fix "fullscreen" mode on Windows 7 with several monitors.
[ Mike DePaulo ]
* New upstream release (4.0.2.1):
diff --git a/wapi.cpp b/wapi.cpp
index c9a8c5a..fe01f81 100644
--- a/wapi.cpp
+++ b/wapi.cpp
@@ -30,24 +30,26 @@
long wapiSetFSWindow ( HWND hWnd, const QRect& desktopGeometry )
{
- long style=GetWindowLong ( hWnd,GWL_STYLE );
- SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
+ SetWindowLong(hWnd, GWL_STYLE,
+ WS_VISIBLE);
+ SetWindowLong(hWnd, GWL_EXSTYLE,
+ 0);
+ SetWindowPos ( hWnd, HWND_TOPMOST, desktopGeometry.x(),
desktopGeometry.y(),
desktopGeometry.width(),
desktopGeometry.height(),
- SWP_FRAMECHANGED );
- SetWindowLong ( hWnd, GWL_STYLE,
- WS_VISIBLE | WS_SYSMENU |
- WS_CLIPCHILDREN | WS_CLIPSIBLINGS );
-
- SetWindowPos ( hWnd, HWND_TOP, desktopGeometry.x(),
+ 0);
+ Sleep(2000);
+ SetWindowLong(hWnd, GWL_STYLE,
+ WS_VISIBLE);
+ SetWindowLong(hWnd, GWL_EXSTYLE,
+ 0);
+ SetWindowPos ( hWnd, HWND_TOPMOST, desktopGeometry.x(),
desktopGeometry.y(),
desktopGeometry.width(),
desktopGeometry.height(),
- SWP_FRAMECHANGED );
-
- SetForegroundWindow ( hWnd );
- return style;
+ SWP_NOSIZE);
+ return WS_VISIBLE;
}
void wapiRestoreWindow( HWND hWnd, long style, const QRect& desktopGeometry )
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list