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

[Herbert Dürr]

 vcl/aqua/source/window/salframeview.mm |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f3d79c1f54fb998119a099bad629804ad01eb36
Author: Herbert Dürr <hdu at apache.org>
Date:   Fri Jan 18 11:28:03 2013 +0000

    Resolves: #i119006# disable OSX>=10.7 window restoration until...
    
    we support it directly
    
    (cherry picked from commit 1b8988f7eefd5ec0d70abd6f83b2cd7197ca5935)
    
    Conflicts:
    	vcl/aqua/source/window/salframeview.mm
    
    Change-Id: I726ac047e45fc76a075d4c9ceae237316aacc6ea

diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 1afc228..4680965 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -158,6 +158,7 @@ static AquaSalFrame* getMouseContainerFrame()
     NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
     [pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver
 
+    // enable OSX>=10.7 fullscreen options if available and useful
     bool bAllowFullScreen = (0 == (mpFrame->mnStyle & (SAL_FRAME_STYLE_DIALOG | SAL_FRAME_STYLE_TOOLTIP | SAL_FRAME_STYLE_SYSTEMCHILD | SAL_FRAME_STYLE_FLOAT | SAL_FRAME_STYLE_TOOLWINDOW | SAL_FRAME_STYLE_INTRO)));
     bAllowFullScreen &= (0 == (~mpFrame->mnStyle & (SAL_FRAME_STYLE_SIZEABLE)));
     bAllowFullScreen &= (mpFrame->mpParent == NULL);