When load default value or save changes will pop up message box to let user
confirm,Y means confirm and N means ignore,now add Esc key with the
same function of N key.And change the context of pop up message in .uni file,
now will display "Press 'Y' to confirm, 'N/ESC' to ignore."

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan...@intel.com>
---
 .../Universal/DisplayEngineDxe/FormDisplay.c        |   3 ++-
 .../Universal/DisplayEngineDxe/FormDisplayStr.uni   | Bin 17032 -> 17048 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c 
b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index ae3038b..aba149f 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -2257,11 +2257,12 @@ FxConfirmPopup (
   StrCatS (CfmStr, MaxLen, gConfirmMsgEnd);
 
   do {
     CreateDialog (&Key, gEmptyString, CfmStr, gConfirmOpt, gEmptyString, NULL);
   } while (((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (gConfirmOptYes[0] 
| UPPER_LOWER_CASE_OFFSET)) &&
-           ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (gConfirmOptNo[0] | 
UPPER_LOWER_CASE_OFFSET)));
+           ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) != (gConfirmOptNo[0] | 
UPPER_LOWER_CASE_OFFSET)) &&
+           (Key.ScanCode != SCAN_ESC));
 
   if ((Key.UnicodeChar | UPPER_LOWER_CASE_OFFSET) == (gConfirmOptYes[0] | 
UPPER_LOWER_CASE_OFFSET)) {
     RetVal = TRUE;
   } else {
     RetVal = FALSE;
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni 
b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplayStr.uni
index 
5c6ad48433b2c6f50016dc27a5801da90930e76f..5efae823acd3a129495fe4077866037cb0022890
 100644
GIT binary patch
delta 34
jcmeBZWt`E<xZ#{ByFP;}LokE$<g=y+VeHMlX1}=sz#<CN

delta 38
scmbQy%GlA$xZ#}X<SKiv$t%o6CUXcBO%AY^n%rO}1`^x6!t4V#02~GmRR910

-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to