Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-02-21 01:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix InputDialog with style function

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-03-04 06:40:49 +03:00
parent 4e63e897cb
commit ab6d11f473
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rEFIt_UEFI/gui/menu_items/menu_items.h
View File

@ -509,13 +509,14 @@ public:
UINTN RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INTN *DefaultEntryIndex, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); 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 RunMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry);
UINTN RunMainMenu(IN INTN DefaultSelection, 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 DrawMainMenuLabel(IN CONST CHAR16 *Text, IN INTN XPos, IN INTN YPos);
VOID CountItems(); VOID CountItems();
VOID InitAnime(); VOID InitAnime();
BOOLEAN GetAnime(); BOOLEAN GetAnime();
VOID UpdateAnime(); VOID UpdateAnime();
UINTN InputDialog();
//Style functions //Style functions
virtual VOID MainMenuStyle(IN UINTN Function, IN CONST CHAR16 *ParamText); virtual VOID MainMenuStyle(IN UINTN Function, IN CONST CHAR16 *ParamText);

16
rEFIt_UEFI/refit/menu.cpp
View File

@ -2571,9 +2571,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT
ScrollState.LastSelection = ScrollState.CurrentSelection; ScrollState.LastSelection = ScrollState.CurrentSelection;
ScrollState.CurrentSelection = mItemID; ScrollState.CurrentSelection = mItemID;
if ( Entries[mItemID].getREFIT_INPUT_DIALOG() || Entries[mItemID].getREFIT_MENU_CHECKBIT() ) { if ( Entries[mItemID].getREFIT_INPUT_DIALOG() || Entries[mItemID].getREFIT_MENU_CHECKBIT() ) {
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
} else if (Entries[mItemID].getREFIT_MENU_SWITCH()) { } else if (Entries[mItemID].getREFIT_MENU_SWITCH()) {
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
HidePointer(); HidePointer();
} else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) { } 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; ScrollState.CurrentSelection = mItemID;
if ((Entries[mItemID].getREFIT_INPUT_DIALOG()) || if ((Entries[mItemID].getREFIT_INPUT_DIALOG()) ||
(Entries[mItemID].getREFIT_MENU_CHECKBIT())) { (Entries[mItemID].getREFIT_MENU_CHECKBIT())) {
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
} else if (Entries[mItemID].getREFIT_MENU_SWITCH()) { } else if (Entries[mItemID].getREFIT_MENU_SWITCH()) {
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
HidePointer(); HidePointer();
} else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) { } 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: case CHAR_CARRIAGE_RETURN:
if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) || if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) ||
(Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) { (Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) {
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
} else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){ } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
} else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_ENTRY_CLOVER()){ } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_ENTRY_CLOVER()){
MenuExit = MENU_EXIT_DETAILS; MenuExit = MENU_EXIT_DETAILS;
@ -2760,9 +2760,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT
case ' ': //CHAR_SPACE case ' ': //CHAR_SPACE
if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) || if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) ||
(Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) { (Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) {
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
} else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){ } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){
MenuExit = InputDialog(); MenuExit = InputDialog(StyleFunc);
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
HidePointer(); HidePointer();
} else if (!Entries[ScrollState.CurrentSelection].getREFIT_INFO_DIALOG()) { } else if (!Entries[ScrollState.CurrentSelection].getREFIT_INFO_DIALOG()) {