Add a 'quit' parameter to 'close' event cb

On OSX, when user hit 'Cmd-Q', the close event is sent with a 'quit' parameter to distinguish with other cases for closing window Fix #430
nwjs · Dec 27, 2013 · e342d2c · e342d2c
1 parent a0de620
commit e342d2c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -133,15 +133,15 @@ void App::Call(Shell* shell,
 }
 
 // static
-void App::CloseAllWindows(bool force) {
+void App::CloseAllWindows(bool force, bool quit) {
   std::vector<Shell*> windows = Shell::windows();
 
   for (size_t i = 0; i < windows.size(); ++i) {
     // Only send close event to browser windows, since devtools windows will
     // be automatically closed.
     if (!windows[i]->is_devtools()) {
       // If there is no js object bound to the window, then just close.
-      if (force || windows[i]->ShouldCloseWindow())
+      if (force || windows[i]->ShouldCloseWindow(quit))
         // we used to delete the Shell object here
         // but it should be deleted on native window destruction
         windows[i]->window()->Close();

diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -47,7 +47,7 @@ class App {
                    base::ListValue* result);
 
   // Try to close all windows (then will cause whole app to quit).
-  static void CloseAllWindows(bool force = false);
+  static void CloseAllWindows(bool force = false, bool quit = false);
 
   // Quit the whole app.
   static void Quit(content::RenderProcessHost* rph = NULL);

diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -235,7 +235,7 @@ @interface ShellNSWindow : ChromeEventProcessingWindow {
 }
 - (void)setShell:(const base::WeakPtr<content::Shell>&)shell;
 - (void)showDevTools:(id)sender;
-- (void)closeAllWindows:(id)sender;
+- (void)closeAllWindowsQuit:(id)sender;
 @end
 
 @implementation ShellNSWindow
@@ -249,8 +249,8 @@ - (void)showDevTools:(id)sender {
     shell_->ShowDevTools();
 }
 
-- (void)closeAllWindows:(id)sender {
-  nwapi::App::CloseAllWindows();
+- (void)closeAllWindowsQuit:(id)sender {
+  nwapi::App::CloseAllWindows(false, true);
 }
 
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen

diff --git a/src/browser/standard_menus_mac.mm b/src/browser/standard_menus_mac.mm
@@ -71,7 +71,7 @@ - (void)setAppleMenu:(NSMenu *)menu;
   [appleMenu addItem:[NSMenuItem separatorItem]];
 
   [appleMenu addItemWithTitle:l10n_util::GetNSStringFWithFixup(IDS_EXIT_MAC, name)
-                       action:@selector(closeAllWindows:)
+                       action:@selector(closeAllWindowsQuit:)
                 keyEquivalent:@"q"];
 
   // Add to menubar.

diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -248,11 +248,11 @@ void Shell::SendEvent(const std::string& event, const base::ListValue& args) {
       web_contents->GetRoutingID(), id(), event, args));
 }
 
-bool Shell::ShouldCloseWindow() {
+bool Shell::ShouldCloseWindow(bool quit) {
   if (id() < 0 || force_close_)
     return true;
 
-  SendEvent("close");
+  SendEvent("close", quit ? "quit" : "");
   return false;
 }
 

diff --git a/src/nw_shell.h b/src/nw_shell.h
@@ -105,7 +105,7 @@ class Shell : public WebContentsDelegate,
   void SendEvent(const std::string& event, const base::ListValue& args);
 
   // Decide whether we should close the window.
-  bool ShouldCloseWindow();
+  bool ShouldCloseWindow(bool quit = false);
 
   virtual GURL OverrideDOMStorageOrigin(const GURL& origin);