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

Do not behave like bookmarkbar menu

Browse source
This commit is contained in:
Cheng Zhao 2016-01-05 11:57:58 +08:00
parent 48451032e3
commit 43bfce26a7
4 changed files with 60 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

18
atom/browser/ui/views/menu_bar.cc
View file

@ -134,6 +134,16 @@ bool MenuBar::GetMenuButtonFromScreenPoint(const gfx::Point& point,
return false;
}
void MenuBar::RunMenu(views::MenuButton* button) {
int id = button->tag();
ui::MenuModel::ItemType type = menu_model_->GetTypeAt(id);
if (type != ui::MenuModel::TYPE_SUBMENU)
return;
MenuDelegate menu_delegate(this);
menu_delegate.RunMenu(menu_model_->GetSubmenuModelAt(id), button);
}
const char* MenuBar::GetClassName() const {
return kViewClassName;
}
@ -150,13 +160,7 @@ void MenuBar::OnMenuButtonClicked(views::View* source,
return;
views::MenuButton* button = static_cast<views::MenuButton*>(source);
int id = button->tag();
ui::MenuModel::ItemType type = menu_model_->GetTypeAt(id);
if (type != ui::MenuModel::TYPE_SUBMENU)
return;
menu_delegate_.reset(new MenuDelegate(this));
menu_delegate_->RunMenu(menu_model_->GetSubmenuModelAt(id), button);
RunMenu(button);
}
} // namespace atom