Disable app menu during laf modal dialogs on macOS

This commit is contained in:
Shiqing 2019-03-22 13:40:31 +08:00
parent e9d7fd2a06
commit 223002c182

View File

@ -728,7 +728,9 @@ void AppMenus::createNativeMenus()
UIContext::instance()->executeCommand(cmd);
}
};
about.validate = [](os::MenuItem* item){ item->setEnabled(true); };
about.validate = [native](os::MenuItem* item){
item->setEnabled(can_call_global_shortcut(&native));
};
os::MenuItemInfo preferences("Preferences...");
native = get_native_shortcut_for_command(CommandId::Options());
@ -739,7 +741,9 @@ void AppMenus::createNativeMenus()
UIContext::instance()->executeCommand(cmd);
}
};
preferences.validate = [](os::MenuItem* item){ item->setEnabled(true); };
preferences.validate = [native](os::MenuItem* item){
item->setEnabled(can_call_global_shortcut(&native));
};
os::MenuItemInfo hide("Hide " PACKAGE, os::MenuItemInfo::Hide);
hide.shortcut = os::Shortcut('h', os::kKeyCmdModifier);