sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable nest for suppressif/grayoutif/diableif for form/question/option.

Browse Source 
Signed-off-by: ydong10
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12972 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10
2012-01-31 07:17:42 +00:00
parent 4641e70095
commit 31585af434
9 changed files with 606 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
/** @file
Utility functions for User Interface functions.
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -731,8 +731,10 @@ UiAddMenuOption (
}
MenuOption->Sequence = Index;
if (Statement->GrayOutExpression != NULL) {
MenuOption->GrayOut = Statement->GrayOutExpression->Result.Value.b;
if (EvaluateExpressionList(Statement->Expression, FALSE, NULL, NULL) == ExpressGrayOut ) {
MenuOption->GrayOut = TRUE;
} else {
MenuOption->GrayOut = FALSE;
}
//
@@ -1999,12 +2001,7 @@ ProcessGotoOpCode (
RefForm = IdToForm (Selection->FormSet, Statement->HiiValue.Value.ref.FormId);
if ((RefForm != NULL) && (RefForm->SuppressExpression != NULL)) {
Status = EvaluateExpression (Selection->FormSet, RefForm, RefForm->SuppressExpression);
if (EFI_ERROR (Status)) {
return Status;
}
if (RefForm->SuppressExpression->Result.Value.b) {
if (EvaluateExpressionList(RefForm->SuppressExpression, TRUE, Selection->FormSet, RefForm) != ExpressFalse) {
//
// Form is suppressed.
//