tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine the logic about gFunctionKeySetting, avoid some HII drivers can't show the hotkey info. 

Also add missing code in UI.c

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14208 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2013-03-15 02:53:56 +00:00
parent 3c36de6c12
commit 4f353467b6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -305,8 +305,6 @@ SendForm (
//
InitializeBrowserStrings ();
gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;
//
// Ensure we are in Text mode
//
@ -4009,6 +4007,8 @@ InitializeFormSet (
}
}
gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;
if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) {
gFrontPageHandle = FormSet->HiiHandle;
gFunctionKeySetting = NONE_FUNCTION_KEY_SETTING;

3
MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
View File

@ -3285,7 +3285,8 @@ UiDisplayMenu (
// Check whether Key matches the registered hot key.
//
HotKey = NULL;
if ((gBrowserSettingScope == SystemLevel) || (gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {
if ((gBrowserSettingScope == SystemLevel) ||
(Selection->FormEditable && gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {
HotKey = GetHotKeyFromRegisterList (&Key);
}
if (HotKey != NULL) {