From ce5ac1b056229565ea52e7184c8e19c2d9d0afc8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 16 Feb 2017 11:15:05 -0800 Subject: [PATCH] Implement ClosePopupAt on Windows/Linux --- atom/browser/api/atom_api_menu_views.cc | 4 ++++ atom/browser/api/atom_api_menu_views.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/atom/browser/api/atom_api_menu_views.cc b/atom/browser/api/atom_api_menu_views.cc index d3d4b2cbbc6a..59fdac39491c 100644 --- a/atom/browser/api/atom_api_menu_views.cc +++ b/atom/browser/api/atom_api_menu_views.cc @@ -62,6 +62,10 @@ void MenuViews::PopupAt( ui::MENU_SOURCE_MOUSE)); } +void MenuViews::ClosePopupAt(int32_t window_id) { + menu_runners_.erase(window_id); +} + // static mate::WrappableBase* Menu::New(mate::Arguments* args) { return new MenuViews(args->isolate(), args->GetThis()); diff --git a/atom/browser/api/atom_api_menu_views.h b/atom/browser/api/atom_api_menu_views.h index 2e4c84a03b79..f59e9d5b8928 100644 --- a/atom/browser/api/atom_api_menu_views.h +++ b/atom/browser/api/atom_api_menu_views.h @@ -23,7 +23,7 @@ class MenuViews : public Menu { protected: void PopupAt( Window* window, int x, int y, int positioning_item, bool async) override; - void ClosePopupAt(int32_t window_id); + void ClosePopupAt(int32_t window_id) override; private: std::map> menu_runners_;