tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 16:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error: Multiline option info only shows the first line error, should shows the full info.

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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12566 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2011-10-25 09:00:23 +00:00
parent 9c24540944
commit 5f4ef94a55
1 changed files with 68 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1308,16 +1308,12 @@ GetLineByWidth (
@param Selection The user's selection. @param Selection The user's selection.
@param MenuOption The MenuOption to be checked. @param MenuOption The MenuOption to be checked.
@param OptionalString The option string.
@param SkipValue The number of lins to skip.
**/ **/
VOID VOID
UpdateOptionSkipLines ( UpdateOptionSkipLines (
IN UI_MENU_SELECTION *Selection, IN UI_MENU_SELECTION *Selection,
IN UI_MENU_OPTION *MenuOption, IN UI_MENU_OPTION *MenuOption
OUT CHAR16 **OptionalString,
IN UINTN SkipValue
) )
{ {
UINTN Index; UINTN Index;
@ -1328,9 +1324,7 @@ UpdateOptionSkipLines (
CHAR16 *OptionString; CHAR16 *OptionString;
Row = 0; Row = 0;
OptionString = *OptionalString; OptionString = NULL;
OutputString = NULL;
ProcessOptions (Selection, MenuOption, FALSE, &OptionString); ProcessOptions (Selection, MenuOption, FALSE, &OptionString);
if (OptionString != NULL) { if (OptionString != NULL) {
@ -1343,7 +1337,6 @@ UpdateOptionSkipLines (
// If there is more string to process print on the next row and increment the Skip value // If there is more string to process print on the next row and increment the Skip value
// //
if (StrLen (&OptionString[Index]) != 0) { if (StrLen (&OptionString[Index]) != 0) {
if (SkipValue == 0) {
Row++; Row++;
// //
// Since the Number of lines for this menu entry may or may not be reflected accurately // Since the Number of lines for this menu entry may or may not be reflected accurately
@ -1356,18 +1349,16 @@ UpdateOptionSkipLines (
MenuOption->Skip++; MenuOption->Skip++;
} }
} }
}
FreePool (OutputString); FreePool (OutputString);
if (SkipValue != 0) {
SkipValue--;
}
} }
Row = OriginalRow; Row = OriginalRow;
} }
*OptionalString = OptionString; if (OptionString != NULL) {
FreePool (OptionString);
}
} }
@ -1431,6 +1422,7 @@ ValueIsScroll (
This is an internal function. This is an internal function.
@param Selection Menu selection.
@param GoUp The navigation direction. TRUE: up, FALSE: down. @param GoUp The navigation direction. TRUE: up, FALSE: down.
@param CurrentPosition Current position. @param CurrentPosition Current position.
@param GapToTop Gap position to top or bottom. @param GapToTop Gap position to top or bottom.
@ -1440,6 +1432,7 @@ ValueIsScroll (
**/ **/
INTN INTN
MoveToNextStatement ( MoveToNextStatement (
IN UI_MENU_SELECTION *Selection,
IN BOOLEAN GoUp, IN BOOLEAN GoUp,
IN OUT LIST_ENTRY **CurrentPosition, IN OUT LIST_ENTRY **CurrentPosition,
IN UINTN GapToTop IN UINTN GapToTop
@ -1456,6 +1449,10 @@ MoveToNextStatement (
while (TRUE) { while (TRUE) {
NextMenuOption = MENU_OPTION_FROM_LINK (Pos); NextMenuOption = MENU_OPTION_FROM_LINK (Pos);
if (NextMenuOption->Row == 0) {
UpdateOptionSkipLines (Selection, NextMenuOption);
}
if (GoUp && (PreMenuOption != NextMenuOption)) { if (GoUp && (PreMenuOption != NextMenuOption)) {
// //
// Current Position doesn't need to be caculated when go up. // Current Position doesn't need to be caculated when go up.
@ -2324,7 +2321,7 @@ UiDisplayMenu (
ControlFlag = CfUpdateHelpString; ControlFlag = CfUpdateHelpString;
if (InitializedFlag) { if (InitializedFlag) {
InitializedFlag = FALSE; InitializedFlag = FALSE;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);
} }
// //
@ -2353,20 +2350,45 @@ UiDisplayMenu (
for (Index = TopRow; Index <= BottomRow && Link != NewPos;) { for (Index = TopRow; Index <= BottomRow && Link != NewPos;) {
SavedMenuOption = MENU_OPTION_FROM_LINK (Link); SavedMenuOption = MENU_OPTION_FROM_LINK (Link);
Index += SavedMenuOption->Skip; Index += SavedMenuOption->Skip;
if (Link == TopOfScreen) {
Index -= OldSkipValue;
}
Link = Link->ForwardLink; Link = Link->ForwardLink;
} }
if (NewPos == Link) {
SavedMenuOption = MENU_OPTION_FROM_LINK (Link);
}
if (Link != NewPos || Index > BottomRow) { if (Link != NewPos || Index > BottomRow || (Link == NewPos && SavedMenuOption->Row + SavedMenuOption->Skip - 1 > BottomRow)) {
// //
// NewPos is not in the current page, simply scroll page so that NewPos is in the end of the page // NewPos is not in the current page, simply scroll page so that NewPos is in the end of the page
// //
SavedMenuOption = MENU_OPTION_FROM_LINK (NewPos);
//
// SavedMenuOption->Row == 0 means the menu not show yet.
//
if (SavedMenuOption->Row == 0) {
UpdateOptionSkipLines (Selection, SavedMenuOption);
}
Link = NewPos; Link = NewPos;
for (Index = TopRow; Index <= BottomRow; ) { for (Index = TopRow + SavedMenuOption->Skip; Index <= BottomRow + 1; ) {
Link = Link->BackLink; Link = Link->BackLink;
SavedMenuOption = MENU_OPTION_FROM_LINK (Link); SavedMenuOption = MENU_OPTION_FROM_LINK (Link);
if (SavedMenuOption->Row == 0) {
UpdateOptionSkipLines (Selection, SavedMenuOption);
}
Index += SavedMenuOption->Skip; Index += SavedMenuOption->Skip;
} }
SkipValue = Index - BottomRow - 1;
if (SkipValue > 0 && SkipValue < (INTN) SavedMenuOption->Skip) {
TopOfScreen = Link;
OldSkipValue = SkipValue;
} else {
SkipValue = 0;
TopOfScreen = Link->ForwardLink; TopOfScreen = Link->ForwardLink;
}
Repaint = TRUE; Repaint = TRUE;
NewLine = TRUE; NewLine = TRUE;
@ -2899,10 +2921,13 @@ UiDisplayMenu (
NewPos = NewPos->BackLink; NewPos = NewPos->BackLink;
PreviousMenuOption = MENU_OPTION_FROM_LINK (NewPos); PreviousMenuOption = MENU_OPTION_FROM_LINK (NewPos);
if (PreviousMenuOption->Row == 0) {
UpdateOptionSkipLines (Selection, PreviousMenuOption);
}
DistanceValue = PreviousMenuOption->Skip; DistanceValue = PreviousMenuOption->Skip;
Difference = 0; Difference = 0;
if (MenuOption->Row >= DistanceValue + TopRow) { if (MenuOption->Row >= DistanceValue + TopRow) {
Difference = MoveToNextStatement (TRUE, &NewPos, MenuOption->Row - TopRow - DistanceValue); Difference = MoveToNextStatement (Selection, TRUE, &NewPos, MenuOption->Row - TopRow - DistanceValue);
} }
NextMenuOption = MENU_OPTION_FROM_LINK (NewPos); NextMenuOption = MENU_OPTION_FROM_LINK (NewPos);
@ -2977,6 +3002,9 @@ UiDisplayMenu (
while ((Index >= TopRow) && (Link->BackLink != &gMenuOption)) { while ((Index >= TopRow) && (Link->BackLink != &gMenuOption)) {
Link = Link->BackLink; Link = Link->BackLink;
PreviousMenuOption = MENU_OPTION_FROM_LINK (Link); PreviousMenuOption = MENU_OPTION_FROM_LINK (Link);
if (PreviousMenuOption->Row == 0) {
UpdateOptionSkipLines (Selection, PreviousMenuOption);
}
if (Index < PreviousMenuOption->Skip) { if (Index < PreviousMenuOption->Skip) {
Index = 0; Index = 0;
break; break;
@ -2988,19 +3016,19 @@ UiDisplayMenu (
if (TopOfScreen == &gMenuOption) { if (TopOfScreen == &gMenuOption) {
TopOfScreen = gMenuOption.ForwardLink; TopOfScreen = gMenuOption.ForwardLink;
NewPos = gMenuOption.BackLink; NewPos = gMenuOption.BackLink;
MoveToNextStatement (TRUE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, TRUE, &NewPos, BottomRow - TopRow);
Repaint = FALSE; Repaint = FALSE;
} else if (TopOfScreen != Link) { } else if (TopOfScreen != Link) {
TopOfScreen = Link; TopOfScreen = Link;
NewPos = Link; NewPos = Link;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);
} else { } else {
// //
// Finally we know that NewPos is the last MenuOption can be focused. // Finally we know that NewPos is the last MenuOption can be focused.
// //
Repaint = FALSE; Repaint = FALSE;
NewPos = Link; NewPos = Link;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);
} }
} else { } else {
if (Index + 1 < TopRow) { if (Index + 1 < TopRow) {
@ -3015,10 +3043,10 @@ UiDisplayMenu (
// //
if (TopOfScreen == &gMenuOption) { if (TopOfScreen == &gMenuOption) {
NewPos = gMenuOption.BackLink; NewPos = gMenuOption.BackLink;
MoveToNextStatement (TRUE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, TRUE, &NewPos, BottomRow - TopRow);
} else { } else {
NewPos = Link; NewPos = Link;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);
} }
// //
@ -3062,7 +3090,7 @@ UiDisplayMenu (
// Finally we know that NewPos is the last MenuOption can be focused. // Finally we know that NewPos is the last MenuOption can be focused.
// //
Repaint = FALSE; Repaint = FALSE;
MoveToNextStatement (TRUE, &Link, Index - TopRow); MoveToNextStatement (Selection, TRUE, &Link, Index - TopRow);
} else { } else {
if (Index - 1 > BottomRow) { if (Index - 1 > BottomRow) {
// //
@ -3078,7 +3106,7 @@ UiDisplayMenu (
// //
// Move to the option in Next page. // Move to the option in Next page.
// //
MoveToNextStatement (FALSE, &Link, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &Link, BottomRow - TopRow);
} }
// //
@ -3110,7 +3138,7 @@ UiDisplayMenu (
Difference = 0; Difference = 0;
if (BottomRow >= MenuOption->Row + MenuOption->Skip) { if (BottomRow >= MenuOption->Row + MenuOption->Skip) {
Difference = MoveToNextStatement (FALSE, &NewPos, BottomRow - MenuOption->Row - MenuOption->Skip); Difference = MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - MenuOption->Row - MenuOption->Skip);
// //
// We hit the end of MenuOption that can be focused // We hit the end of MenuOption that can be focused
// so we simply scroll to the first page. // so we simply scroll to the first page.
@ -3127,7 +3155,7 @@ UiDisplayMenu (
MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry); MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry);
} }
NewPos = gMenuOption.ForwardLink; NewPos = gMenuOption.ForwardLink;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);
// //
// If we are at the end of the list and sitting on a Date/Time op, rewind to the head. // If we are at the end of the list and sitting on a Date/Time op, rewind to the head.
@ -3142,7 +3170,7 @@ UiDisplayMenu (
// //
// An option might be multi-line, so we need to reflect that data in the overall skip value // An option might be multi-line, so we need to reflect that data in the overall skip value
// //
UpdateOptionSkipLines (Selection, NextMenuOption, &OptionString, (UINTN) SkipValue); UpdateOptionSkipLines (Selection, NextMenuOption);
DistanceValue = Difference + NextMenuOption->Skip; DistanceValue = Difference + NextMenuOption->Skip;
Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1; Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1;
@ -3259,7 +3287,7 @@ UiDisplayMenu (
} }
NewLine = TRUE; NewLine = TRUE;
NewPos = gMenuOption.ForwardLink; NewPos = gMenuOption.ForwardLink;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);
} }
// //