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

fix: Linux empty menu model handling (#15605)

Browse source 
* fix: Linux empty menu model handling

* Update root_view.cc
This commit is contained in:
Nitish Sakhawalkar 2018-11-08 08:11:15 -08:00 • committed by Shelley Vohr
parent ae9f4ef425
commit 48ebebcafe
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_views.cc
View file

@ -894,7 +894,6 @@ void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
if (menu_model == nullptr) { if (menu_model == nullptr) {
global_menu_bar_.reset(); global_menu_bar_.reset();
root_view_->UnregisterAcceleratorsWithFocusManager(); root_view_->UnregisterAcceleratorsWithFocusManager();
return;
} }
if (!global_menu_bar_ && ShouldUseGlobalMenuBar()) if (!global_menu_bar_ && ShouldUseGlobalMenuBar())

3
atom/browser/ui/views/root_view.cc
View file

@ -178,9 +178,10 @@ bool RootView::AcceleratorPressed(const ui::Accelerator& accelerator) {
} }
void RootView::RegisterAcceleratorsWithFocusManager(AtomMenuModel* menu_model) { void RootView::RegisterAcceleratorsWithFocusManager(AtomMenuModel* menu_model) {
if (!menu_model)
return;
// Clear previous accelerators. // Clear previous accelerators.
UnregisterAcceleratorsWithFocusManager(); UnregisterAcceleratorsWithFocusManager();
views::FocusManager* focus_manager = GetFocusManager(); views::FocusManager* focus_manager = GetFocusManager();
// Register accelerators with focus manager. // Register accelerators with focus manager.
accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model); accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);