From ab6d11f4730f215335d92550d6e11243f6569366 Mon Sep 17 00:00:00 2001 From: Sergey Isakov Date: Wed, 4 Mar 2020 06:40:49 +0300 Subject: [PATCH] fix InputDialog with style function Signed-off-by: Sergey Isakov --- rEFIt_UEFI/gui/menu_items/menu_items.h | 3 ++- rEFIt_UEFI/refit/menu.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rEFIt_UEFI/gui/menu_items/menu_items.h b/rEFIt_UEFI/gui/menu_items/menu_items.h index fabf56813..0c6150cc7 100644 --- a/rEFIt_UEFI/gui/menu_items/menu_items.h +++ b/rEFIt_UEFI/gui/menu_items/menu_items.h @@ -509,13 +509,14 @@ public: UINTN RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INTN *DefaultEntryIndex, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN RunMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN RunMainMenu(IN INTN DefaultSelection, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); + UINTN InputDialog(IN MENU_STYLE_FUNC StyleFunc); VOID DrawMainMenuLabel(IN CONST CHAR16 *Text, IN INTN XPos, IN INTN YPos); VOID CountItems(); VOID InitAnime(); BOOLEAN GetAnime(); VOID UpdateAnime(); - UINTN InputDialog(); + //Style functions virtual VOID MainMenuStyle(IN UINTN Function, IN CONST CHAR16 *ParamText); diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp index 05927a55b..22187d5bb 100644 --- a/rEFIt_UEFI/refit/menu.cpp +++ b/rEFIt_UEFI/refit/menu.cpp @@ -2571,9 +2571,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT ScrollState.LastSelection = ScrollState.CurrentSelection; ScrollState.CurrentSelection = mItemID; if ( Entries[mItemID].getREFIT_INPUT_DIALOG() || Entries[mItemID].getREFIT_MENU_CHECKBIT() ) { - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); } else if (Entries[mItemID].getREFIT_MENU_SWITCH()) { - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); ScrollState.PaintAll = TRUE; HidePointer(); } else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) { @@ -2594,9 +2594,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT ScrollState.CurrentSelection = mItemID; if ((Entries[mItemID].getREFIT_INPUT_DIALOG()) || (Entries[mItemID].getREFIT_MENU_CHECKBIT())) { - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); } else if (Entries[mItemID].getREFIT_MENU_SWITCH()) { - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); ScrollState.PaintAll = TRUE; HidePointer(); } else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) { @@ -2747,9 +2747,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT case CHAR_CARRIAGE_RETURN: if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) || (Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) { - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){ - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); ScrollState.PaintAll = TRUE; } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_ENTRY_CLOVER()){ MenuExit = MENU_EXIT_DETAILS; @@ -2760,9 +2760,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT case ' ': //CHAR_SPACE if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) || (Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) { - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){ - MenuExit = InputDialog(); + MenuExit = InputDialog(StyleFunc); ScrollState.PaintAll = TRUE; HidePointer(); } else if (!Entries[ScrollState.CurrentSelection].getREFIT_INFO_DIALOG()) {