[Libreoffice-commits] core.git: vcl/osx

Tor Lillqvist tml at collabora.com
Wed Jun 27 12:52:24 UTC 2018


 vcl/osx/salframe.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 387f00311a1b2d12d16ae5731347cdc4328afa4a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 27 13:54:51 2018 +0300

    tdf#53282: Leave (our own) full-screen mode when the AquaSalFrame is dying
    
    Change-Id: I85243dff96b9090de0fd55564b44abb6142d9ac2
    Reviewed-on: https://gerrit.libreoffice.org/56524
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 31159f8545c0..d4debf4ef09a 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -92,6 +92,9 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, SalFrameStyleFlags salFrameStyle
 
 AquaSalFrame::~AquaSalFrame()
 {
+    if (mbFullScreen)
+        ShowFullScreen(false, maGeometry.nDisplayScreenNumber);
+
     assert( GetSalData()->mpInstance->IsMainThread() );
 
     // if the frame is destroyed and has the current menubar


More information about the Libreoffice-commits mailing list