diff options
author | Herbert Dürr <hdu@apache.org> | 2013-01-18 11:28:03 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-29 11:36:31 +0100 |
commit | 4f3d79c1f54fb998119a099bad629804ad01eb36 (patch) | |
tree | 8ad56fa01d99f5e37152db7bb9c1a81a7a52abb9 | |
parent | 41d2036bee3279928903cdada115d3e3cd022a06 (diff) |
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
-rw-r--r-- | vcl/aqua/source/window/salframeview.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 1afc228473f8..4680965f99b8 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); |