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

chore: use ScopedPumpMessagesInPrivateModes in tray (#18977)

Browse source 
* chore: use ScopedPumpMessagesInPrivateModes in tray

* revert refcounting of AtomMenuModel

* Prefer WeakPtr for posting tasks to handle unexpected destruction
This commit is contained in:
Shelley Vohr 2019-06-26 10:18:53 -07:00 • committed by GitHub
parent d643921313
commit 6243dba068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
shell/browser/ui/tray_icon_cocoa.mm
View file

@ -337,7 +337,12 @@ const CGFloat kVerticalTitleMargin = 2;
}
- (void)popUpContextMenu:(electron::AtomMenuModel*)menu_model {
// Make sure events can be pumped while the menu is up.
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
// Ensure the UI can update while the menu is fading out.
base::ScopedPumpMessagesInPrivateModes pump_private;
// Show a custom menu.
if (menu_model) {
base::scoped_nsobject<AtomMenuController> menuController(
@ -346,7 +351,6 @@ const CGFloat kVerticalTitleMargin = 2;
forceHighlight_ = YES; // Should highlight when showing menu.
[self setNeedsDisplay:YES];
base::mac::ScopedSendingEvent sendingEventScoper;
[statusItem_ popUpStatusItemMenu:[menuController menu]];
forceHighlight_ = NO;
[self setNeedsDisplay:YES];
@ -357,7 +361,6 @@ const CGFloat kVerticalTitleMargin = 2;
// Redraw the tray icon to show highlight if it is enabled.
[self setNeedsDisplay:YES];
base::mac::ScopedSendingEvent sendingEventScoper;
[statusItem_ popUpStatusItemMenu:[menuController_ menu]];
// The popUpStatusItemMenu returns only after the showing menu is closed.
// When it returns, we need to redraw the tray icon to not show highlight.
@ -456,7 +459,7 @@ const CGFloat kVerticalTitleMargin = 2;
namespace electron {
TrayIconCocoa::TrayIconCocoa() {
TrayIconCocoa::TrayIconCocoa() : weak_factory_(this) {
status_item_view_.reset([[StatusItemView alloc] initWithIcon:this]);
}
@ -498,17 +501,16 @@ bool TrayIconCocoa::GetIgnoreDoubleClickEvents() {
return [status_item_view_ getIgnoreDoubleClickEvents];
}
void TrayIconCocoa::PopUpOnUI(scoped_refptr<AtomMenuModel> menu_model) {
if (auto* model = menu_model.get())
[status_item_view_ popUpContextMenu:model];
void TrayIconCocoa::PopUpOnUI(AtomMenuModel* menu_model) {
[status_item_view_ popUpContextMenu:menu_model];
}
void TrayIconCocoa::PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model) {
base::PostTaskWithTraits(
FROM_HERE, {content::BrowserThread::UI},
base::BindOnce(&TrayIconCocoa::PopUpOnUI, base::Unretained(this),
base::WrapRefCounted(menu_model)));
base::BindOnce(&TrayIconCocoa::PopUpOnUI, weak_factory_.GetWeakPtr(),
base::Unretained(menu_model)));
}
void TrayIconCocoa::SetContextMenu(AtomMenuModel* menu_model) {