[API] Add 'maximize' and 'unmaximize' event for Window, fix nwjs#201.

zcbenz · zcbenz · commit 521028695305 · 2012-12-13T13:51:01.000+08:00
diff --git a/src/browser/native_window_gtk.cc b/src/browser/native_window_gtk.cc
@@ -504,7 +504,7 @@ gboolean NativeWindowGtk::OnWindowState(GtkWidget* window,
       if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
         shell()->SendEvent("maximize");
       else
-        shell()->SendEvent("demaximize");
+        shell()->SendEvent("unmaximize");
       break;
     case GDK_WINDOW_STATE_FULLSCREEN:
       if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -127,6 +127,18 @@ - (void)windowDidDeminiaturize:(NSNotification *)notification {
   shell_->SendEvent("restore");
 }
 
+- (BOOL)windowShouldZoom:(NSWindow*)window toFrame:(NSRect)newFrame {
+  // Cocoa doen't have concept of maximize/unmaximize, so wee need to emulate
+  // them by calculating size change when zooming.
+  if (newFrame.size.width < [window frame].size.width ||
+      newFrame.size.height < [window frame].size.height)
+    shell_->SendEvent("unmaximize");
+  else
+    shell_->SendEvent("maximize");
+
+  return YES;
+}
+
 - (void)cleanup:(id)window {
   delete shell_;
 
diff --git a/src/browser/native_window_win.cc b/src/browser/native_window_win.cc
@@ -575,6 +575,10 @@ bool NativeWindowWin::ExecuteWindowsCommand(int command_id) {
   } else if (command_id == SC_RESTORE && is_minimized_) {
     is_minimized_ = false;
     shell()->SendEvent("restore");
+  } else if (command_id == SC_RESTORE && !is_minimized_) {
+    shell()->SendEvent("unmaximize");
+  } else if (command_id == SC_MAXIMIZE) {
+    shell()->SendEvent("maximize");
   }
 
   return false;
diff --git a/tests/window/popup.html b/tests/window/popup.html
@@ -42,6 +42,14 @@
     console.log('Window is restored');
   });
 
+  win.on('maximize', function() {
+    console.log('Window is maximized');
+  });
+
+  win.on('unmaximize', function() {
+    console.log('Window is unmaximized');
+  });
+
   window.onload = function() {
     gui.Window.get().show();
   }
