Update the arrow position.

Use the parameter” LEFT_SKIPPED_COLUMNS” to adjust the position from the beginning of the line to the beginning of the menu string.
The arrow position and the beginning of the menu string are fixed in one block space.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11327 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 5 insertions, 3 deletions

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index f5717e1c6..ba30506d1 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -62,7 +62,7 @@ extern UINT8  SetupBrowserStrings[];
 

 #define FRONT_PAGE_HEADER_HEIGHT      6

 #define NONE_FRONT_PAGE_HEADER_HEIGHT 3

-#define LEFT_SKIPPED_COLUMNS          1

+#define LEFT_SKIPPED_COLUMNS          3

 #define FOOTER_HEIGHT                 4

 #define STATUS_BAR_HEIGHT             1

 #define SCROLL_ARROW_HEIGHT           1

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 83b13b193..54f9db097 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1793,12 +1793,14 @@ UiDisplayMenu (
           Width       = GetWidth (Statement, MenuOption->Handle);

           OriginalRow = Row;

 

-          if (Statement->Operand == EFI_IFR_REF_OP && ((gClassOfVfr & FORMSET_CLASS_PLATFORM_SETUP) == FORMSET_CLASS_PLATFORM_SETUP)) {

+          if (Statement->Operand == EFI_IFR_REF_OP && 

+            ((gClassOfVfr & FORMSET_CLASS_PLATFORM_SETUP) == FORMSET_CLASS_PLATFORM_SETUP) &&

+            MenuOption->Col > 2) {

             //

             // Print Arrow for Goto button.

             //

             PrintAt (

-              MenuOption->Col - LEFT_SKIPPED_COLUMNS,

+              MenuOption->Col - 2,

               Row,

               L"%c",

               GEOMETRICSHAPE_RIGHT_TRIANGLE