[WIN] Handle WM_SIZE in maximize case

rogerwang · rogerwang · commit c93489c2949d · 2013-12-18T14:19:45.000+08:00
Fix nwjs#753
diff --git a/src/browser/native_window_win.cc b/src/browser/native_window_win.cc
@@ -520,6 +520,10 @@ bool NativeWindowWin::ShouldShowWindowTitle() const {
   return has_frame();
 }
 
+bool NativeWindowWin::ShouldHandleOnSize() const {
+  return true;
+}
+
 void NativeWindowWin::OnNativeFocusChange(gfx::NativeView focused_before,
                                           gfx::NativeView focused_now) {
   gfx::NativeView this_window = GetWidget()->GetNativeView();
@@ -659,12 +663,20 @@ bool NativeWindowWin::ExecuteWindowsCommand(int command_id) {
     is_maximized_ = false;
     if (shell())
       shell()->SendEvent("unmaximize");
-  } else if ((command_id & sc_mask) == SC_MAXIMIZE) {
+  }
+  return false;
+}
+
+bool NativeWindowWin::HandleSize(unsigned int param, const gfx::Size& size) {
+  if (param == SIZE_MAXIMIZED) {
     is_maximized_ = true;
     if (shell())
       shell()->SendEvent("maximize");
+  }else if (param == SIZE_RESTORED && is_maximized_) {
+    is_maximized_ = false;
+    if (shell())
+      shell()->SendEvent("unmaximize");
   }
-
   return false;
 }
 
@@ -681,7 +693,7 @@ void NativeWindowWin::SaveWindowPlacement(const gfx::Rect& bounds,
                                           ui::WindowShowState show_state) {
   // views::WidgetDelegate::SaveWindowPlacement(bounds, show_state);
 }
-  
+
 void NativeWindowWin::OnViewWasResized() {
   // Set the window shape of the RWHV.
   DCHECK(window_);
diff --git a/src/browser/native_window_win.h b/src/browser/native_window_win.h
@@ -100,6 +100,7 @@ class NativeWindowWin : public NativeWindow,
   virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
   virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
   virtual bool ShouldShowWindowTitle() const OVERRIDE;
+  virtual bool ShouldHandleOnSize()    const OVERRIDE;
 
   // WidgetFocusChangeListener implementation.
   virtual void OnNativeFocusChange(gfx::NativeView focused_before,
@@ -126,6 +127,7 @@ class NativeWindowWin : public NativeWindow,
 
   // views::WidgetDelegate implementation.
   virtual bool ExecuteWindowsCommand(int command_id) OVERRIDE;
+  virtual bool HandleSize(unsigned int param, const gfx::Size& size) OVERRIDE;
   virtual bool ExecuteAppCommand(int command_id) OVERRIDE;
   virtual void SaveWindowPlacement(const gfx::Rect& bounds,
                                    ui::WindowShowState show_state) OVERRIDE;
