[X2Go-Commits] [x2goclient] 01/01: Fix maximizing client window in thinclient mode with Qt5 (bullseye).

git-admin at x2go.org git-admin at x2go.org
Mon Jan 4 18:39:02 CET 2021


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 99036126347f91ac9d9de58ff15f151e27727efe
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Mon Jan 4 11:38:47 2021 -0600

    Fix maximizing client window in thinclient mode with Qt5 (bullseye).
---
 debian/changelog          | 1 +
 src/onmainwindow.cpp      | 4 ++++
 src/onmainwindow_privat.h | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2240a50..7ec4103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
       value in the client config section.
     - Set min width of session status label.
     - set clipboard mode of x2gokdriveclient in cmd line option.
+    - Fix maximizing client window in thinclient mode with Qt5 (bullseye).
 
   [ Ryan Schmidt ]
   * New upstream version (4.1.2.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 2df52dd..72d42c3 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -627,7 +627,11 @@ void ONMainWindow::initUI()
     if (thinMode)
     {
         x2goDebug<<"Thin Mode is active.";
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+        resize(QGuiApplication::primaryScreen()->size());
+#else
         showMaximized();
+#endif
         activateWindow();
         raise();
     }
diff --git a/src/onmainwindow_privat.h b/src/onmainwindow_privat.h
index d37f4c9..3a4ba82 100644
--- a/src/onmainwindow_privat.h
+++ b/src/onmainwindow_privat.h
@@ -72,6 +72,9 @@
 #include <QLocalSocket>
 #if QT_VERSION < 0x050000
 #include <QPlastiqueStyle>
+#else
+#include <QGuiApplication>
+#include <QScreen>
 #endif
 #include "imgframe.h"
 #include <QToolTip>

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list