summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Schneider2014-05-07 17:50:52 +0200
committerManuel Schneider2014-05-07 17:50:52 +0200
commit2d02ff1a920e0901b3e7bd7b77e34a9ea97fa83b (patch)
tree85abd5a247dea99be4820217fb71c1eec94e57b8
parentMerge branch 'master' of git.openslx.org:pvs2 (diff)
downloadpvs2-2d02ff1a920e0901b3e7bd7b77e34a9ea97fa83b.tar.gz
pvs2-2d02ff1a920e0901b3e7bd7b77e34a9ea97fa83b.tar.xz
pvs2-2d02ff1a920e0901b3e7bd7b77e34a9ea97fa83b.zip
Show taskbar too
* Let vnc stream complete screen * Let thumbnail display complete screen
-rw-r--r--src/client/net/serverconnection.cpp4
-rw-r--r--src/client/vnc/vncserver.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp
index 760b445..c590dc5 100644
--- a/src/client/net/serverconnection.cpp
+++ b/src/client/net/serverconnection.cpp
@@ -191,8 +191,8 @@ void ServerConnection::handleMsg()
y = 300;
// Get rect of primary screen
- int primary = QApplication::desktop()->primaryScreen();
- QRect primaryRect = QApplication::desktop()->availableGeometry(primary);
+ const QDesktopWidget primary;
+ const QRect primaryRect = primary.screenGeometry();
QPixmap desktop(
QPixmap::grabWindow(
diff --git a/src/client/vnc/vncserver.cpp b/src/client/vnc/vncserver.cpp
index 3cb640c..56800f4 100644
--- a/src/client/vnc/vncserver.cpp
+++ b/src/client/vnc/vncserver.cpp
@@ -108,8 +108,8 @@ void VncServer::start()
args << "-autoport" << QString::number(54112);
// Get rect of primary screen
- int primary = QApplication::desktop()->primaryScreen();
- QRect primaryRect = QApplication::desktop()->availableGeometry(primary);
+ const QDesktopWidget desktop;
+ const QRect primaryRect = desktop.screenGeometry();
// Tell x11vnc to just use primary screen
args << "-clip";