[X2Go-Commits] [nx-libs] 45/51: Screen.c: fix size calculation in rootless mode

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository nx-libs.

commit 3c92b5db9d3d90967410c4dc1d1f8a45554c724b
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Jan 13 23:47:53 2019 +0100

    Screen.c: fix size calculation in rootless mode
    
    There's no need to reduce the size to 75% in rootless mode. We always
    want to have the full size then.
    
    Fixes ArcticaProject/nx-libs#757 (Part 2/2)
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index cfe0fd9..bd0236a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1080,12 +1080,26 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
 
     if (nxagentOption(Width) > w)
     {
-      nxagentChangeOption(Width, w * 3 / 4);
+      if (nxagentOption(Rootless))
+      {
+        nxagentChangeOption(Width, w);
+      }
+      else
+      {
+        nxagentChangeOption(Width, w * 3 / 4);
+      }
     }
 
     if (nxagentOption(Height) > h)
     {
-      nxagentChangeOption(Height, h * 3 / 4);
+      if (nxagentOption(Rootless))
+      {
+        nxagentChangeOption(Height, h);
+      }
+      else
+      {
+        nxagentChangeOption(Height, h * 3 / 4);
+      }
     }
 
     /*

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