XQuartz: Reposition windows when we enter fullscreen to ensure our root window

(cherry picked from commit 7617d3659b5481ef85aecc1f936e7dd2662bdfbd)

1 files changed, 8 insertions, 4 deletions

diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 7f302010b..1f0b0048b 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -326,2 +326,6 @@ void QuartzSetFullscreen(Bool state) {
     
+    if (quartzHasRoot || quartzEnableRootless) {
+        RootlessRepositionWindows(screenInfo.screens[0]);
+    }
+
     /* Somehow the menubar manages to interfere with our event stream
@@ -343,2 +347,4 @@ void QuartzSetRootless(Bool state) {
 
+    xp_disable_update();
+
     /* When in rootless, the menubar is not part of the screen, so we need to update our screens on toggle */    
@@ -347,10 +353,8 @@ void QuartzSetRootless(Bool state) {
     if (!quartzEnableRootless && !quartzHasRoot) {
-        xp_disable_update();
         RootlessHideAllWindows();
-        xp_reenable_update();
     } else if (quartzEnableRootless && !quartzHasRoot) {
-        xp_disable_update();
         RootlessShowAllWindows();
-        xp_reenable_update();
     }
+
+    xp_reenable_update();
 }