[X2Go-Commits] [nx-libs] 127/219: Screen.c: simplify nxagentMinimizeFromFullscreen

[git-admin at x2go.org]

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

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

commit ea571387b2bed7738eb686a806b1416f239b556b
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Jun 27 19:51:03 2019 +0200

    Screen.c: simplify nxagentMinimizeFromFullscreen
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index ebc5d6ce9..54aa8f4e0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -319,6 +319,13 @@ Bool nxagentIsParentOf(Display *d, Window possible_parent, Window candidate)
   }
 }
 
+/*
+ * Pressing the minimize keystroke while in fullscreen mode will call
+ * this function. It will unmap the fullscreen window and iconify the
+ * previously created icon window immediately. The window manager may
+ * decide how to show an iconified window. kwin e.g. shows it in the
+ * task bar.
+ */
 void nxagentMinimizeFromFullScreen(ScreenPtr pScreen)
 {
   XUnmapWindow(nxagentDisplay, nxagentFullscreenWindow);
@@ -326,14 +333,10 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen)
   if (nxagentIpaq)
   {
     XMapWindow(nxagentDisplay, nxagentIconWindow);
-    XIconifyWindow(nxagentDisplay, nxagentIconWindow,
-                       DefaultScreen(nxagentDisplay));
   }
-  else
-  {
-    XIconifyWindow(nxagentDisplay, nxagentIconWindow,
+
+  XIconifyWindow(nxagentDisplay, nxagentIconWindow,
                        DefaultScreen(nxagentDisplay));
-  }
 }
 
 /*

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