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

first pass at menu event emission

Browse source
This commit is contained in:
Shelley Vohr 2018-01-27 09:35:58 -05:00
parent 39554566cc
commit 3399480304
No known key found for this signature in database
GPG key ID: F13993A75599653C
6 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/ui/atom_menu_model.cc
View file

@ -42,8 +42,16 @@ bool AtomMenuModel::GetAcceleratorAtWithParams(
void AtomMenuModel::MenuWillClose() {
ui::SimpleMenuModel::MenuWillClose();
for (Observer& observer : observers_)
observer.MenuWillClose();
for (Observer& observer : observers_) {
observer.OnMenuWillClose();
}
}
void AtomMenuModel::MenuWillShow() {
ui::SimpleMenuModel::MenuWillShow();
for (Observer& observer : observers_) {
observer.OnMenuWillShow();
}
}
AtomMenuModel* AtomMenuModel::GetSubmenuModelAt(int index) {

6
atom/browser/ui/atom_menu_model.h
View file

@ -36,8 +36,11 @@ class AtomMenuModel : public ui::SimpleMenuModel {
public:
virtual ~Observer() {}
// Notifies the menu will open.
virtual void OnMenuWillShow() {}
// Notifies the menu has been closed.
virtual void MenuWillClose() {}
virtual void OnMenuWillClose() {}
};
explicit AtomMenuModel(Delegate* delegate);
@ -54,6 +57,7 @@ class AtomMenuModel : public ui::SimpleMenuModel {
// ui::SimpleMenuModel:
void MenuWillClose() override;
void MenuWillShow() override;
using SimpleMenuModel::GetSubmenuModelAt;
AtomMenuModel* GetSubmenuModelAt(int index);

2
atom/browser/ui/tray_icon_cocoa.h
View file

@ -35,7 +35,7 @@ class TrayIconCocoa : public TrayIcon,
protected:
// AtomMenuModel::Observer:
void MenuWillClose() override;
void OnMenuWillClose() override;
private:
// Atom custom view for NSStatusItem.

2
atom/browser/ui/tray_icon_cocoa.mm
View file

@ -461,7 +461,7 @@ gfx::Rect TrayIconCocoa::GetBounds() {
return bounds;
}
void TrayIconCocoa::MenuWillClose() {
void TrayIconCocoa::OnMenuWillClose() {
[status_item_view_ setNeedsDisplay:YES];
}