[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-17-g1830e1f

[X2Go dev team]

The branch, master has been updated
       via  1830e1f54afad8750cef92cb59c866bbe0356795 (commit)
      from  ebecc1268b26b2789caa48c8d186c0c19f152989 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1830e1f54afad8750cef92cb59c866bbe0356795
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 18 20:59:25 2013 +0200

    Fix detection of maximum screen area available for a session. (Fixes: #165).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    5 +++++
 onmainwindow.cpp |   18 ++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b8ecce2..c203fd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
       Let's consider a given SSH private key that fails to log the user
       in as an overall login failure. (Fixes: #141).
 
+  [ Ricardo Díaz Martín ]
+  * New upstream version (4.0.1.1):
+    - Fix detection of maximum screen area available for a session. (Fixes:
+      #165).
+
   [ Otto Kjell ]
   * New upstream version (4.0.1.1):
     - Enable debug mode through cmd line parameter. (Fixes: #142).
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index c69fc43..ce1b5fe 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3672,10 +3672,20 @@ void ONMainWindow::startNewSession()
         fullscreen=st->setting()->value ( sid+"/fullscreen",
                                           ( QVariant )
                                           defaultFullscreen ).toBool();
-        height=st->setting()->value ( sid+"/height",
-                                      ( QVariant ) defaultHeight ).toInt();
-        width=st->setting()->value ( sid+"/width",
-                                     ( QVariant ) defaultWidth ).toInt();
+
+        //if multidisplay = true or maxdim = true we set maximun display area available for the seleccted monitor
+        if (st->setting()->value(sid + "/multidisp", (QVariant) false).toBool() || st->setting()->value(sid + "/maxdim", (QVariant) false).toBool()) {
+            int selectedScreen = st->setting()->value(sid + "/display", (QVariant) -1).toInt();
+            height=QApplication::desktop()->availableGeometry(selectedScreen).height();
+            width=QApplication::desktop()->availableGeometry(selectedScreen).width();
+        } else {
+            height=st->setting()->value ( sid+"/height",
+                                          ( QVariant ) defaultHeight ).toInt();
+            width=st->setting()->value ( sid+"/width",
+                                         ( QVariant ) defaultWidth ).toInt();
+        }
+
+
         setDPI=st->setting()->value ( sid+"/setdpi",
                                       ( QVariant ) defaultSetDPI ).toBool();
         dpi=st->setting()->value ( sid+"/dpi",


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).