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

SimpleMenuModel::MenuClosed renamed to MenuWillClose

Browse source
This commit is contained in:
Cheng Zhao 2017-01-23 17:53:53 +09:00 • committed by Kevin Sawicki
parent c10eb73166
commit 7a7b72ce04
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,9 +40,9 @@ bool AtomMenuModel::GetAcceleratorAtWithParams(
return false; return false;
} }
void AtomMenuModel::MenuClosed() { void AtomMenuModel::MenuWillClose() {
ui::SimpleMenuModel::MenuClosed(); ui::SimpleMenuModel::MenuWillClose();
FOR_EACH_OBSERVER(Observer, observers_, MenuClosed()); FOR_EACH_OBSERVER(Observer, observers_, MenuWillClose());
} }
AtomMenuModel* AtomMenuModel::GetSubmenuModelAt(int index) { AtomMenuModel* AtomMenuModel::GetSubmenuModelAt(int index) {

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

@ -37,7 +37,7 @@ class AtomMenuModel : public ui::SimpleMenuModel {
virtual ~Observer() {} virtual ~Observer() {}
// Notifies the menu has been closed. // Notifies the menu has been closed.
virtual void MenuClosed() {} virtual void MenuWillClose() {}
}; };
explicit AtomMenuModel(Delegate* delegate); explicit AtomMenuModel(Delegate* delegate);
@ -53,7 +53,7 @@ class AtomMenuModel : public ui::SimpleMenuModel {
ui::Accelerator* accelerator) const; ui::Accelerator* accelerator) const;
// ui::SimpleMenuModel: // ui::SimpleMenuModel:
void MenuClosed() override; void MenuWillClose() override;
using SimpleMenuModel::GetSubmenuModelAt; using SimpleMenuModel::GetSubmenuModelAt;
AtomMenuModel* GetSubmenuModelAt(int index); AtomMenuModel* GetSubmenuModelAt(int index);

4
atom/browser/ui/cocoa/atom_menu_controller.mm
View file

@ -90,7 +90,7 @@ Role kRolesMap[] = {
- (void)cancel { - (void)cancel {
if (isMenuOpen_) { if (isMenuOpen_) {
[menu_ cancelTracking]; [menu_ cancelTracking];
model_->MenuClosed(); model_->MenuWillClose();
isMenuOpen_ = NO; isMenuOpen_ = NO;
} }
} }
@ -265,7 +265,7 @@ Role kRolesMap[] = {
- (void)menuDidClose:(NSMenu*)menu { - (void)menuDidClose:(NSMenu*)menu {
if (isMenuOpen_) { if (isMenuOpen_) {
model_->MenuClosed(); model_->MenuWillClose();
isMenuOpen_ = NO; isMenuOpen_ = NO;
} }
} }

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

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

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

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

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 5f4cf42a6d8f611c859efdde20c085dcc4871919 Subproject commit d24b1b907ad366dc01d4d3d5da981b6164868230