From: Abdul Lateef Attar <abdul@marvell.com>
Date: Mon, 20 Apr 2020 07:05:55 +0000 (+0800)
Subject: MdeModulePkg: Sets the Cursor to selected BootOption.
X-Git-Tag: edk2-stable202008~345
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9b52b06f964226780b7047e10be0c1a65e223eb1;p=mirror_edk2.git

MdeModulePkg: Sets the Cursor to selected BootOption.

Its been observed that in MenuManagerMenuApp when user
selects a different BootOption using Up/Down key, the
current Cursor position is not chaning.
Still points to the old BootOption.

This changes first dispalys/redraws the old BootOption
followed by new BootOption. Doing so will make current
cursor pointing to the user selected BootOption.

Signed-off-by: Abdul Lateef Attar <abdul@marvell.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
---

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
index 34d4089a55..9e729074ec 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
@@ -450,21 +450,11 @@ BootMenuSelectItem (
     RePaintItems = TRUE;
   }
 
-  //
-  // Print want to select item
-  //
-  FirstItem = BootMenuData->ScrollBarControl.FirstItem;
-  gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLACK);
-  String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[WantSelectItem], NULL);
-  PrintCol = StartCol  + 1;
-  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + WantSelectItem - FirstItem;
-  PrintStringAt (PrintCol, PrintRow, String);
-  FreePool (String);
-
   //
   // if Want Select and selected item isn't the same and doesn't re-draw selectable
   // items, clear select item
   //
+  FirstItem = BootMenuData->ScrollBarControl.FirstItem;
   if (WantSelectItem != BootMenuData->SelectItem && !RePaintItems) {
     gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLUE);
     String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[BootMenuData->SelectItem], NULL);
@@ -474,6 +464,16 @@ BootMenuSelectItem (
     FreePool (String);
   }
 
+  //
+  // Print want to select item
+  //
+  gST->ConOut->SetAttribute (gST->ConOut, EFI_WHITE | EFI_BACKGROUND_BLACK);
+  String = HiiGetString (gStringPackHandle, BootMenuData->PtrTokens[WantSelectItem], NULL);
+  PrintCol = StartCol  + 1;
+  PrintRow = StartRow + TITLE_TOKEN_COUNT + 2 + WantSelectItem - FirstItem;
+  PrintStringAt (PrintCol, PrintRow, String);
+  FreePool (String);
+
   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);
   BootMenuData->SelectItem = WantSelectItem;
   return EFI_SUCCESS;