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

gtk: Make AppIndicator.SetContextMenu async, fixes #430.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-26 12:09:07 +08:00
parent 0440c59d18
commit 72d6778894
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/ui/gtk/app_indicator_icon.cc
View file

@ -173,8 +173,6 @@ AppIndicatorIcon::AppIndicatorIcon()
AppIndicatorIcon::~AppIndicatorIcon() { AppIndicatorIcon::~AppIndicatorIcon() {
if (icon_) { if (icon_) {
app_indicator_set_status(icon_, APP_INDICATOR_STATUS_PASSIVE); app_indicator_set_status(icon_, APP_INDICATOR_STATUS_PASSIVE);
// if (gtk_menu_)
// DestroyMenu();
g_object_unref(icon_); g_object_unref(icon_);
content::BrowserThread::GetBlockingPool()->PostTask( content::BrowserThread::GetBlockingPool()->PostTask(
FROM_HERE, FROM_HERE,
@ -220,6 +218,18 @@ void AppIndicatorIcon::SetToolTip(const std::string& tool_tip) {
} }
void AppIndicatorIcon::SetContextMenu(ui::SimpleMenuModel* menu_model) { void AppIndicatorIcon::SetContextMenu(ui::SimpleMenuModel* menu_model) {
// The icon is created asynchronously, wait until the icon has been ready.
if (!icon_) {
content::BrowserThread::GetBlockingPool()
->GetTaskRunnerWithShutdownBehavior(
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)->PostTask(
FROM_HERE,
base::Bind(&AppIndicatorIcon::SetContextMenu,
weak_factory_.GetWeakPtr(),
base::Unretained(menu_model)));
return;
}
menu_.reset(new MenuGtk(NULL, menu_model)); menu_.reset(new MenuGtk(NULL, menu_model));
app_indicator_set_menu(icon_, GTK_MENU(menu_->widget())); app_indicator_set_menu(icon_, GTK_MENU(menu_->widget()));
} }