mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Implement ClosePopupAt on Windows/Linux

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-16 11:15:05 -08:00 committed by Kevin Sawicki
parent 91d1af053f
commit ce5ac1b056
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_menu_views.cc
View file

@ -62,6 +62,10 @@ void MenuViews::PopupAt(
ui::MENU_SOURCE_MOUSE)); ui::MENU_SOURCE_MOUSE));
} }
void MenuViews::ClosePopupAt(int32_t window_id) {
menu_runners_.erase(window_id);
}
// static // static
mate::WrappableBase* Menu::New(mate::Arguments* args) { mate::WrappableBase* Menu::New(mate::Arguments* args) {
return new MenuViews(args->isolate(), args->GetThis()); return new MenuViews(args->isolate(), args->GetThis());

2
atom/browser/api/atom_api_menu_views.h
View file

@ -23,7 +23,7 @@ class MenuViews : public Menu {
protected: protected:
void PopupAt( void PopupAt(
Window* window, int x, int y, int positioning_item, bool async) override; 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: private:
std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_; std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_;