summaryrefslogtreecommitdiff
path: root/vcl/inc/osx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-05-30 11:37:19 +0300
committerTor Lillqvist <tml@collabora.com>2018-05-30 13:50:15 +0200
commitc1452e73091412ba0bb72306329e1912df2ba513 (patch)
treee37191be44f42cdd46c6e0cd39d14a4ebb7468b6 /vcl/inc/osx
parent3cce079c9307315f18b6f49f1de58f52e956e0d6 (diff)
tdf#117872: Revert "tdf#115284: Unify LibreOffice and system full-screen..."
Instead, never participate in the macOS system full-screen mode. There is just too much complexity involved, and the way LibreOffice works really isn't prepared for the concept of windows having the option from a system point of view to being full-screenable or not. This means that the green bubble in window title bars changes from being a (system) full-screen toggle to being a maximize/restore toggle. Sure, the "maximize" concept also probably can be confused with LibreOffice's own full-screen concept. For instance, the Start Centre window is not expecting to be made full-screen. Still, when you from the Start Centre open a Writer document, it is the *same* window that is re-used as the Writer window, and then suddenly should be prepared to handle going full-screen. Also, it is up to each separate kind of document window whether it can be made full-screen (from the LibreOffice point of view) or not. Writer windows can, but Impress windows can't, for example. The View>Full Screen menu entry is added separately each case. Maybe I will come back to this mess later, or not. Anybody else is welcome to have a go, too, of course. This reverts commit 4b42fd7e9516fbbd8a92d97680524f32dd260fb2. Change-Id: I6983481cbd30c0e5190c450483b1246006c80632 Reviewed-on: https://gerrit.libreoffice.org/55049 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/inc/osx')
-rw-r--r--vcl/inc/osx/salframe.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index c615690946f4..c2b53e270648 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -38,6 +38,7 @@
#include <stdexcept>
class AquaSalGraphics;
+class AquaSalFrame;
class AquaSalTimer;
class AquaSalInstance;
class AquaSalMenu;
@@ -60,6 +61,7 @@ public:
int mnMinHeight; // min. client height in pixels
int mnMaxWidth; // max. client width in pixels
int mnMaxHeight; // max. client height in pixels
+ NSRect maFullScreenRect; // old window size when in FullScreen
bool mbGraphics; // is Graphics used?
bool mbFullScreen; // is Window in FullScreen?
bool mbShown;