Improve kiosk mode in OSX by setting app presentation options

bluthen · rogerwang · commit 215d14d6b3c4 · 2019-11-27T01:18:21.000-07:00
Fix nwjs#7201
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -772,11 +772,17 @@ ExtensionFunction::ResponseAction
 NwCurrentWindowInternalEnterKioskModeFunction::Run() {
   AppWindow* window = getAppWindow(this);
   window->ForcedFullscreen();
+#if defined(OS_MACOSX)
+    NWSetNSAppKioskOptions();
+#endif
   return RespondNow(NoArguments());
 }
 
 ExtensionFunction::ResponseAction
 NwCurrentWindowInternalLeaveKioskModeFunction::Run() {
+#if defined(OS_MACOSX)
+    NWRestoreNSAppKioskOptions();
+#endif
   AppWindow* window = getAppWindow(this);
   window->Restore();
   return RespondNow(NoArguments());
@@ -785,10 +791,17 @@ NwCurrentWindowInternalLeaveKioskModeFunction::Run() {
 ExtensionFunction::ResponseAction
 NwCurrentWindowInternalToggleKioskModeFunction::Run() {
   AppWindow* window = getAppWindow(this);
-  if (window->IsFullscreen() || window->IsForcedFullscreen())
+  if (window->IsFullscreen() || window->IsForcedFullscreen()) {
+#if defined(OS_MACOSX)
+    NWRestoreNSAppKioskOptions();
+#endif
     window->Restore();
-  else
+  } else {
     window->ForcedFullscreen();
+#if defined(OS_MACOSX)
+    NWSetNSAppKioskOptions();
+#endif
+  }
   return RespondNow(NoArguments());
 }
 
diff --git a/src/nw_content_mac.h b/src/nw_content_mac.h
@@ -13,4 +13,6 @@ class NativeAppWindow;
 
 std::unique_ptr<base::ListValue> NWChangeAppMenu(nw::Menu* menu);
 void NWSetNSWindowShowInTaskbar(extensions::NativeAppWindow* win, bool show);
+void NWSetNSAppKioskOptions(void);
+void NWRestoreNSAppKioskOptions(void);
 #endif
diff --git a/src/nw_content_mac.mm b/src/nw_content_mac.mm
@@ -54,3 +54,29 @@ void NWSetNSWindowShowInTaskbar(extensions::NativeAppWindow* win, bool show) {
   gfx::SetNSWindowShowInTaskbar(nswin, show);
 }
 
+
+static NSApplicationPresentationOptions previousOptions = 0;
+static bool kiosked = false;
+
+void NWSetNSAppKioskOptions(void) {
+  if(!kiosked) {
+    kiosked = true;
+    previousOptions = [NSApp currentSystemPresentationOptions];
+  }
+  NSApplicationPresentationOptions options = NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar | NSApplicationPresentationDisableProcessSwitching | NSApplicationPresentationDisableForceQuit | NSApplicationPresentationDisableSessionTermination | NSApplicationPresentationDisableHideApplication | NSFullScreenWindowMask | NSApplicationPresentationDisableAppleMenu;
+  [NSApp setPresentationOptions:options];
+  NSWindow *window = [NSApp keyWindow];
+  [window setLevel:NSStatusWindowLevel+1];
+  [NSApp activateIgnoringOtherApps:YES];
+}
+
+void NWRestoreNSAppKioskOptions(void) {
+    if (kiosked) {
+        kiosked = false;
+        // Or should we just use NSApplicationPresentationDefault?
+        [NSApp setPresentationOptions:previousOptions]; 
+        NSWindow *window = [NSApp keyWindow];
+        [window setLevel:NSNormalWindowLevel];
+        [NSApp activateIgnoringOtherApps:NO];
+    }
+}
