// For modal form, clean the entire row.\r
//\r
if ((gFormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r
- return (UINT16)(gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn - gModalSkipColumn - SCROLL_ARROW_HEIGHT);\r
+ if (AdjustWidth != NULL) {\r
+ *AdjustWidth = LEFT_SKIPPED_COLUMNS;\r
+ }\r
+ return (UINT16)(gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn - 2 * (gModalSkipColumn + LEFT_SKIPPED_COLUMNS));\r
}\r
\r
Size = 0;\r
if (!ValueIsScroll (TRUE, TopOfScreen)) {\r
UpArrow = TRUE;\r
}\r
- \r
- PrintStringAtWithWidth(gStatementDimensions.LeftColumn, TopRow - 1, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn);\r
\r
+ if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r
+ PrintStringAtWithWidth(gStatementDimensions.LeftColumn + gModalSkipColumn, TopRow - 1, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn - 2 * gModalSkipColumn);\r
+ } else {\r
+ PrintStringAtWithWidth(gStatementDimensions.LeftColumn, TopRow - 1, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn);\r
+ }\r
if (UpArrow) {\r
gST->ConOut->SetAttribute (gST->ConOut, GetArrowColor ());\r
PrintCharAt (\r
SavedMenuOption = MenuOption;\r
SkipHighLight = TRUE;\r
}\r
- \r
- DisplayOneMenu (MenuOption, \r
- ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) ? LEFT_SKIPPED_COLUMNS + gModalSkipColumn : LEFT_SKIPPED_COLUMNS,\r
- gStatementDimensions.LeftColumn, \r
- Link == TopOfScreen ? SkipValue : 0, \r
- BottomRow,\r
- Link == NewPos && IsSelectable(MenuOption)\r
- );\r
+\r
+ if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r
+ DisplayOneMenu (MenuOption, \r
+ LEFT_SKIPPED_COLUMNS,\r
+ gStatementDimensions.LeftColumn + gModalSkipColumn, \r
+ Link == TopOfScreen ? SkipValue : 0, \r
+ BottomRow,\r
+ Link == NewPos && IsSelectable(MenuOption)\r
+ );\r
+ } else {\r
+ DisplayOneMenu (MenuOption, \r
+ LEFT_SKIPPED_COLUMNS,\r
+ gStatementDimensions.LeftColumn, \r
+ Link == TopOfScreen ? SkipValue : 0, \r
+ BottomRow,\r
+ Link == NewPos && IsSelectable(MenuOption)\r
+ ); \r
+ }\r
\r
//\r
// 3. Update the row info which will be used by next menu.\r
//\r
while (Row <= BottomRow) {\r
if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r
- PrintStringAtWithWidth(gStatementDimensions.LeftColumn, Row++, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn);\r
+ PrintStringAtWithWidth(gStatementDimensions.LeftColumn + gModalSkipColumn, Row++, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn - 2 * gModalSkipColumn);\r
} else {\r
PrintStringAtWithWidth(gStatementDimensions.LeftColumn, Row++, L"", gStatementDimensions.RightColumn - gHelpBlockWidth - gStatementDimensions.LeftColumn);\r
}\r
//\r
// 4. Print the down arrow row.\r
//\r
- PrintStringAtWithWidth(gStatementDimensions.LeftColumn, BottomRow + 1, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn);\r
- \r
+ if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {\r
+ PrintStringAtWithWidth(gStatementDimensions.LeftColumn + gModalSkipColumn, BottomRow + 1, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn - 2 * + gModalSkipColumn);\r
+ } else {\r
+ PrintStringAtWithWidth(gStatementDimensions.LeftColumn, BottomRow + 1, L"", gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn);\r
+ }\r
if (DownArrow) {\r
gST->ConOut->SetAttribute (gST->ConOut, GetArrowColor ());\r
PrintCharAt (\r