aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.h
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-10-18 12:30:54 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-10-18 12:30:54 +0200
commit13211ec6a5060db75c93cbb4e75d017b0a49386e (patch)
treed73d06fd267eb90d707dd2106fcdffc17230074c /nx-X11/programs/Xserver/hw/nxagent/Screen.h
parent7a02b4aba77a64b38992f1a20d8c851bdcc11500 (diff)
parent2d99cdd1cf5d8d0e8248d94bc07dca8ff32e4058 (diff)
downloadnx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.tar.gz
nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.tar.bz2
nx-libs-13211ec6a5060db75c93cbb4e75d017b0a49386e.zip
Merge branch 'uli42-pr/window_resize_bug' into 3.6.x
Attributes GH PR #940: https://github.com/ArcticaProject/nx-libs/pull/940
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.h')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
index 6d775e1cc..3eb16ea3c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
@@ -110,9 +110,9 @@ Window nxagentCreateIconWindow(void);
Bool nxagentMagicPixelZone(int x, int y);
Bool nxagentResizeScreen(ScreenPtr pScreen, int width, int height,
- int mmWidth, int mmHeight);
+ int mmWidth, int mmHeight, Bool doresize);
-int nxagentChangeScreenConfig(int screen, int width, int height);
+int nxagentChangeScreenConfig(int screen, int width, int height, Bool doresize);
int nxagentAdjustRandRXinerama(ScreenPtr pScreen);