diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
| commit | 68320ff05946f092b6836754c6267b1dff2f4633 (patch) | |
| tree | 424d73f509dff521d4cc22a95369594b7ee56dad /xorg-server/hw/xquartz/X11Controller.m | |
| parent | 71b5bea4d5ef75f50bd7bd7b93f47f8552c178e0 (diff) | |
| parent | 58ff764d4111bfaa7360c57bc62dd620fbdce06f (diff) | |
| download | vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.gz vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.bz2 vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xquartz/X11Controller.m')
| -rw-r--r-- | xorg-server/hw/xquartz/X11Controller.m | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/X11Controller.m b/xorg-server/hw/xquartz/X11Controller.m index 01526b7d0..3de4e139d 100644 --- a/xorg-server/hw/xquartz/X11Controller.m +++ b/xorg-server/hw/xquartz/X11Controller.m @@ -773,6 +773,13 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row - (void) applicationDidHide:(NSNotification *)notify { DarwinSendDDXEvent(kXquartzControllerNotify, 1, AppleWMHideAll); + + /* Toggle off fullscreen mode to leave our non-default video + * mode and hide our guard window. + */ + if (!XQuartzIsRootless && XQuartzFullscreenVisible) { + DarwinSendDDXEvent(kXquartzToggleFullscreen, 0); + } } - (void) applicationDidUnhide:(NSNotification *)notify |