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

Only use default accelerator in Windows/Linux app menu

Browse source
This commit is contained in:
Kevin Sawicki 2016-07-06 16:04:18 -07:00
parent 6381f44f26
commit 2faf00dc19
21 changed files with 125 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window_views.cc
View file

@ -748,7 +748,7 @@ void NativeWindowViews::SetFocusable(bool focusable) {
#endif
}
void NativeWindowViews::SetMenu(ui::MenuModel* menu_model) {
void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
if (menu_model == nullptr) {
// Remove accelerators
accelerator_table_.clear();
@ -1182,7 +1182,7 @@ bool NativeWindowViews::AcceleratorPressed(const ui::Accelerator& accelerator) {
&accelerator_table_, accelerator);
}
void NativeWindowViews::RegisterAccelerators(ui::MenuModel* menu_model) {
void NativeWindowViews::RegisterAccelerators(AtomMenuModel* menu_model) {
// Clear previous accelerators.
views::FocusManager* focus_manager = GetFocusManager();
accelerator_table_.clear();