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

refactor: use Get/SetID from views:View in Button (#35022)

Browse source
This commit is contained in:
Shelley Vohr 2022-07-25 09:46:14 +02:00 • committed by GitHub
parent 08dd38d9be
commit 57c265198e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/ui/views/menu_delegate.cc
View file

@ -34,7 +34,7 @@ void MenuDelegate::RunMenu(ElectronMenuModel* model,
hold_first_switch_ = true;
}
id_ = button->tag();
id_ = button->GetID();
adapter_ = std::make_unique<MenuModelAdapter>(model);
auto* item = new views::MenuItemView(this);
@ -127,7 +127,7 @@ views::MenuItemView* MenuDelegate::GetSiblingMenu(
views::MenuButton* button;
ElectronMenuModel* model;
if (menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, &button) &&
button->tag() != id_) {
button->GetID() != id_) {
bool switch_in_progress = !!button_to_open_;
// Always update target to open.
button_to_open_ = button;