Dynamically show and hide menubar and dock icon

Signed-off-by: Elsie Hupp <[email protected]>

cmake/modules/MacOSXBundleInfo.plist.in

@@ -4,6 +4,8 @@
 <dict>
         <key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>LSUIElement</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleExecutable</key>

src/gui/CMakeLists.txt

@@ -146,6 +146,8 @@ endif()
 
 IF( APPLE )
     list(APPEND client_SRCS cocoainitializer_mac.mm)
+    list(APPEND client_SRCS cocoaprocesstype.mm)
+    list(APPEND client_SRCS cocoaprocesstypeinterface.mm)
     list(APPEND client_SRCS socketapisocket_mac.mm)
     list(APPEND client_SRCS systray.mm)
 

src/gui/cocoaprocesstype.h

@@ -0,0 +1,40 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#import <AppKit/NSApplication.h>
+
+/**
+* @brief CocoaProcessType provides methods for moving the application between
+* the background and foreground.
+* @ingroup gui
+*/
+
+#ifndef COCOAPROCESSTYPE_H
+#define COCOAPROCESSTYPE_H
+
+@interface CocoaProcessType : NSApplication
+
+/**
+ * @brief CocoaProcessTypeToForeground() enables the macOS menubar and dock icon, which are necessary for a maximized window to be able to exit full screen.
+ * @ingroup gui
+ */
++ (void)ToForeground;
+
+/**
+ * @brief CocoaProcessTypeToBackground() disables the macOS menubar and dock icon, so that the application will only be present as a menubar icon.
+ * @ingroup gui
+ */
++ (void)ToBackground;
+
+@end
+
+#endif

src/gui/cocoaprocesstype.mm

@@ -0,0 +1,32 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "cocoaprocesstype.h"
+#include "common/utility.h"
+
+@implementation CocoaProcessType
+
++ (void)ToForeground
+{
+        NSApplicationLoad();
+        ProcessSerialNumber processSerialNumber = { 0, kCurrentProcess };
+        TransformProcessType(&processSerialNumber, kProcessTransformToForegroundApplication);
+}
+
++ (void)ToBackground
+{
+        NSApplicationLoad();
+        ProcessSerialNumber processSerialNumber = { 0, kCurrentProcess };
+        TransformProcessType(&processSerialNumber, kProcessTransformToUIElementApplication);
+}
+
+@end

src/gui/cocoaprocesstypeinterface.h

@@ -0,0 +1,40 @@
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+/**
+* @brief CocoaProcessTypeInterface allows CocoaProcessType to be called C++
+* @ingroup gui
+*/
+
+namespace OCC {
+namespace Mac {
+
+#ifndef COCOAPROCESSTYPEINTERFACE_H
+#define COCOAPROCESSTYPEINTERFACE_H
+
+    /**
+ * @brief CocoaProcessTypeToForeground() enables the macOS menubar and dock icon, which are necessary for a maximized window to be able to exit full screen.
+ * @ingroup gui
+ */
+    void CocoaProcessTypeToForeground();
+
+    /**
+ * @brief CocoaProcessTypeToBackground() disables the macOS menubar and dock icon, so that the application will only be present as a menubar icon.
+ * @ingroup gui
+ */
+    void CocoaProcessTypeToBackground();
+
+#endif
+
+} // namespace Mac
+} // namespace OCC

src/gui/cocoaprocesstypeinterface.mm

@@ -0,0 +1,29 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "cocoaprocesstypeinterface.h"
+#include "cocoaprocesstype.h"
+
+namespace OCC {
+namespace Mac {
+
+    void CocoaProcessTypeToForeground()
+    {
+        [CocoaProcessType ToForeground];
+    }
+    void CocoaProcessTypeToBackground()
+    {
+        [CocoaProcessType ToBackground];
+    }
+
+} // namespace Mac
+} // namespace OCC

src/gui/settingsdialog.cpp

@@ -14,6 +14,7 @@
 
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
+#include "cocoaprocesstypeinterface.h"
 
 #include "folderman.h"
 #include "theme.h"
@@ -86,6 +87,10 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     , _ui(new Ui::SettingsDialog)
     , _gui(gui)
 {
+    if (OCC::Utility::isMac()) {
+        Mac::CocoaProcessTypeToForeground();
+    }
+
     ConfigFile cfg;
 
     _ui->setupUi(this);
@@ -170,6 +175,9 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
 
 SettingsDialog::~SettingsDialog()
 {
+    if (OCC::Utility::isMac()) {
+        Mac::CocoaProcessTypeToBackground();
+    }
     delete _ui;
 }
 
@@ -184,13 +192,19 @@ void SettingsDialog::reject()
     ConfigFile cfg;
     cfg.saveGeometry(this);
     QDialog::reject();
+    if (OCC::Utility::isMac()) {
+        Mac::CocoaProcessTypeToBackground();
+    }
 }
 
 void SettingsDialog::accept()
 {
     ConfigFile cfg;
     cfg.saveGeometry(this);
     QDialog::accept();
+    if (OCC::Utility::isMac()) {
+        Mac::CocoaProcessTypeToBackground();
+    }
 }
 
 void SettingsDialog::changeEvent(QEvent *e)