aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-01-13 23:47:53 +0100
committerUlrich Sibiller <uli42@gmx.de>2019-01-14 00:09:31 +0100
commit3c92b5db9d3d90967410c4dc1d1f8a45554c724b (patch)
tree8a41678947f2e1317576e59b4348a644d1b7f4db /nx-X11/programs/Xserver
parent43d3b655d4f158203b3e39025a3cafc314ba9ad7 (diff)
downloadnx-libs-3c92b5db9d3d90967410c4dc1d1f8a45554c724b.tar.gz
nx-libs-3c92b5db9d3d90967410c4dc1d1f8a45554c724b.tar.bz2
nx-libs-3c92b5db9d3d90967410c4dc1d1f8a45554c724b.zip
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)
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c18
1 files 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 cfe0fd9de..bd0236ad4 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);
+ }
}
/*