MdeModulePkg/CapsuleLib: remove ImageIndex check.

[mirror_edk2.git] / MdeModulePkg / Library / CustomizedDisplayLib / CustomizedDisplayLib.c

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index 5b5f37d175052a724441a762c6aa41708c44db16..e29892ff17f15152c4c68559212ae53e0daf5f4c 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
@@ -2,7 +2,7 @@
 \r
   This library class defines a set of interfaces to customize Display module\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r
 The full text of the license may be found at\r
@@ -135,7 +135,6 @@ RefreshKeyHelp (
 {\r
   UINTN                  SecCol;\r
   UINTN                  ThdCol;\r
-  UINTN                  LeftColumnOfHelp;\r
   UINTN                  RightColumnOfHelp;\r
   UINTN                  TopRowOfHelp;\r
   UINTN                  BottomRowOfHelp;\r
@@ -165,8 +164,10 @@ RefreshKeyHelp (
   SecCol            = gScreenDimensions.LeftColumn + (gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3;\r
   ThdCol            = gScreenDimensions.LeftColumn + (gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3 * 2;\r
 \r
+  //\r
+  // + 2 means leave 1 space before the first hotkey info.\r
+  //\r
   StartColumnOfHelp = gScreenDimensions.LeftColumn + 2;\r
-  LeftColumnOfHelp  = gScreenDimensions.LeftColumn + 1;\r
   RightColumnOfHelp = gScreenDimensions.RightColumn - 1;\r
   TopRowOfHelp      = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - gFooterHeight + 1;\r
   BottomRowOfHelp   = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - 2;\r
@@ -178,6 +179,12 @@ RefreshKeyHelp (
   ColumnStr2        = gLibEmptyString;\r
   ColumnStr3        = gLibEmptyString;\r
 \r
+  //\r
+  // Clean the space at gScreenDimensions.LeftColumn + 1.\r
+  //\r
+  PrintStringAtWithWidth (StartColumnOfHelp - 1, BottomRowOfHelp, gLibEmptyString, 1);\r
+  PrintStringAtWithWidth (StartColumnOfHelp - 1, TopRowOfHelp, gLibEmptyString, 1);\r
+\r
   if (Statement == NULL) {\r
     //\r
     // Print Key for Form without showable statement.\r
@@ -186,7 +193,10 @@ RefreshKeyHelp (
     PrintStringAtWithWidth (StartColumnOfHelp, BottomRowOfHelp, gLibEmptyString, ColumnWidth1);\r
     PrintStringAtWithWidth (SecCol, BottomRowOfHelp, gLibEmptyString, ColumnWidth2);\r
     PrintStringAtWithWidth (StartColumnOfHelp, TopRowOfHelp, gLibEmptyString, ColumnWidth1);\r
-    PrintStringAtWithWidth (ThdCol, BottomRowOfHelp, gEscapeString, ColumnWidth3);\r
+    if (gClassOfVfr == FORMSET_CLASS_PLATFORM_SETUP) {\r
+      ColumnStr3 = gEscapeString;\r
+    }\r
+    PrintStringAtWithWidth (ThdCol, BottomRowOfHelp, ColumnStr3, ColumnWidth3);\r
 \r
     return;\r
   }\r
@@ -543,7 +553,7 @@ CreateDialog (
 /**\r
   Confirm how to handle the changed data. \r
   \r
-  @return Action BROWSER_SAVE_CHANGES, BROWSER_DISCARD_CHANGES or other values.\r
+  @return Action BROWSER_ACTION_SUBMIT, BROWSER_ACTION_DISCARD or other values.\r
 **/\r
 UINTN\r
 EFIAPI\r
@@ -573,11 +583,11 @@ ConfirmDataChange (
   );\r
   \r
   if (Key.ScanCode == SCAN_ESC) {\r
-    return BROWSER_NO_CHANGES;\r
+    return BROWSER_ACTION_NONE;\r
   } else if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (YesResponse | UPPER_LOWER_CASE_OFFSET)) {\r
-    return BROWSER_SAVE_CHANGES;\r
+    return BROWSER_ACTION_SUBMIT;\r
   } else {\r
-    return BROWSER_DISCARD_CHANGES;\r
+    return BROWSER_ACTION_DISCARD;\r
   }\r
 }\r
 \r
@@ -668,7 +678,7 @@ PrintStringAtWithWidth (
 }\r
 \r
 /**\r
-  Prints a chracter to the default console, at\r
+  Prints a character to the default console, at\r
   the supplied cursor position, using L"%c" format.\r
 \r
   @param  Column     The cursor position to print the string at. When it is -1, use current Position.\r