[OSX] make 'show' event optional

rogerwang · rogerwang · commit b672cabb6aa0 · 2015-01-01T20:59:23.000+08:00
Conflicts:
	src/api/menu/menu.h
	src/api/menu/menu.js
	src/api/menu/menu_delegate_mac.mm
diff --git a/src/api/menu/menu.cc b/src/api/menu/menu.cc
@@ -30,7 +30,7 @@ namespace nwapi {
 Menu::Menu(int id,
            const base::WeakPtr<DispatcherHost>& dispatcher_host,
            const base::DictionaryValue& option)
-    : Base(id, dispatcher_host, option) {
+  : enable_show_event_(false), Base(id, dispatcher_host, option) {
   Create(option);
 }
 
@@ -63,6 +63,8 @@ void Menu::Call(const std::string& method,
     arguments.GetInteger(1, &y);
     Popup(x, y, content::Shell::FromRenderViewHost(
           dispatcher_host()->render_view_host()));
+  } else if (method == "EnableShowEvent") {
+    arguments.GetBoolean(0, &enable_show_event_);
   } else {
     NOTREACHED() << "Invalid call to Menu method:" << method
                  << " arguments:" << arguments;
diff --git a/src/api/menu/menu.h b/src/api/menu/menu.h
@@ -101,6 +101,10 @@ class Menu : public Base {
   ui::NwMenuModel* model() { return menu_model_.get(); }
 #endif
 
+  bool enable_show_event() { return enable_show_event_; }
+ protected:
+  bool enable_show_event_;
+
  private:
   friend class MenuItem;
   friend class Tray;
diff --git a/src/api/menu/menu.js b/src/api/menu/menu.js
@@ -19,6 +19,8 @@
 //  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var v8_util = process.binding('v8_util');
+var EventEmitter = process.EventEmitter;
+
 
 function Menu(option) {
   if (typeof option != 'object')
@@ -70,9 +72,26 @@ Menu.prototype.popup = function(x, y) {
 }
 
 if (require('os').platform() === 'darwin'){
+  Menu.prototype.on = Menu.prototype.addListener = function(ev, callback) {
+    if (ev == 'show') {
+        nw.callObjectMethod(this, 'EnableShowEvent', [ true ]);
+    }
+    // Call parent.
+    EventEmitter.prototype.addListener.apply(this, arguments);
+  }
+
+  Menu.prototype.removeListener = function(ev, callback) {
+    // Call parent.
+    EventEmitter.prototype.removeListener.apply(this, arguments);
+    if (ev == 'show' && EventEmitter.listenerCount(this, 'show') === 0) {
+        nw.callObjectMethod(this, 'EnableShowEvent', [ false ]);
+    }
+  }
+
   Menu.prototype.createMacBuiltin = function (app_name, options) {
     var appleMenu = new Menu(),
         options = options || {};
+
     appleMenu.append(new exports.MenuItem({
         label: nw.getNSStringFWithFixup("IDS_ABOUT_MAC", app_name),
         selector: "orderFrontStandardAboutPanel:"
diff --git a/src/api/menu/menu_delegate_mac.mm b/src/api/menu/menu_delegate_mac.mm
@@ -39,6 +39,7 @@ - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
+
   if (!nwmenu_->enable_show_event() || nwmenu_->dispatcher_host()->run_loop())
     return;
 
@@ -50,6 +51,9 @@ - (void)menuNeedsUpdate:(NSMenu*)menu {
   // if ([event type] != NSSystemDefined || [event subtype] == 8)
   //  return;
 
+  if (!nwmenu_->enable_show_event())
+    return;
+
   base::ListValue args;
   base::RunLoop run_loop;
   nwmenu_->dispatcher_host()->set_run_loop(&run_loop);
