Fix nwjs#7272: win.leaveKioskMode() and win.toggleKioskMode() not working

rogerwang · rogerwang · commit 89b55fc418a7 · 2020-01-12T01:05:16.000-07:00
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -772,6 +772,9 @@ NwCurrentWindowInternalEnterKioskModeInternalFunction::Run() {
     if (browser) {
       BrowserFrame* frame = BrowserView::GetBrowserViewForBrowser(browser)->frame();
       frame->SetFullscreen(true);
+#if !defined(OS_MACOSX)
+      browser->window()->SetZOrderLevel(ui::ZOrderLevel::kFloatingWindow);
+#endif
     }
   } else {
     AppWindow* window = getAppWindow(this);
@@ -794,7 +797,10 @@ NwCurrentWindowInternalLeaveKioskModeInternalFunction::Run() {
     Browser* browser = getBrowser(this, id);
     if (browser) {
       BrowserFrame* frame = BrowserView::GetBrowserViewForBrowser(browser)->frame();
-      frame->Restore();
+      frame->SetFullscreen(false);
+#if !defined(OS_MACOSX)
+      browser->window()->SetZOrderLevel(ui::ZOrderLevel::kNormal);
+#endif
       return RespondNow(NoArguments());
     }
   }
@@ -812,14 +818,18 @@ NwCurrentWindowInternalToggleKioskModeInternalFunction::Run() {
     if (browser) {
       BrowserFrame* frame = BrowserView::GetBrowserViewForBrowser(browser)->frame();
       if (frame->IsFullscreen()) {
-        frame->Restore();
+        frame->SetFullscreen(false);
 #if defined(OS_MACOSX)
         NWRestoreNSAppKioskOptions();
-#endif
+#else
+        browser->window()->SetZOrderLevel(ui::ZOrderLevel::kNormal);
+#endif	
       } else {
         frame->SetFullscreen(true);
 #if defined(OS_MACOSX)
         NWSetNSAppKioskOptions();
+#else
+        browser->window()->SetZOrderLevel(ui::ZOrderLevel::kFloatingWindow);
 #endif
       }
       return RespondNow(NoArguments());
