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

allow triple os name like chrome,grub,linux

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-04-09 06:32:57 +03:00
parent ea3058f867
commit 13588fb67c
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rEFIt_UEFI/gui/REFIT_MENU_SCREEN.h
View File

@ -100,6 +100,7 @@ public:
UINTN FrameTime; //ms UINTN FrameTime; //ms
EG_RECT FilmPlace; EG_RECT FilmPlace;
EG_IMAGE **Film; EG_IMAGE **Film;
ACTION mAction; ACTION mAction;
UINTN mItemID; UINTN mItemID;
SCROLL_STATE ScrollState; SCROLL_STATE ScrollState;

13
rEFIt_UEFI/libeg/XTheme.cpp
View File

@ -368,6 +368,7 @@ const XImage& XTheme::LoadOSIcon(const XString& Full)
// input value can be L"win", L"ubuntu,linux", L"moja,mac" set by GetOSIconName (OSVersion) // input value can be L"win", L"ubuntu,linux", L"moja,mac" set by GetOSIconName (OSVersion)
XString First; XString First;
XString Second; XString Second;
XString Third;
const XImage *ReturnImage; const XImage *ReturnImage;
UINTN Comma = Full.IdxOf(','); UINTN Comma = Full.IdxOf(',');
UINTN Size = Full.size(); UINTN Size = Full.size();
@ -379,7 +380,19 @@ const XImage& XTheme::LoadOSIcon(const XString& Full)
if (!ReturnImage->isEmpty()) return *ReturnImage; if (!ReturnImage->isEmpty()) return *ReturnImage;
//else search second name //else search second name
Second = "os_"_XS + Full.SubString(Comma+1, Size - Comma - 1); Second = "os_"_XS + Full.SubString(Comma+1, Size - Comma - 1);
//moreover names can be triple L"chrome,grub,linux"
UINTN SecondComma = Second.IdxOf(',');
if (Comma == MAX_XSIZE) {
ReturnImage = &GetIcon(Second); ReturnImage = &GetIcon(Second);
if (!ReturnImage->isEmpty()) return *ReturnImage;
} else {
First = Second.SubString(0, SecondComma);
ReturnImage = &GetIcon(First);
if (!ReturnImage->isEmpty()) return *ReturnImage;
Third = "os_"_XS + Second.SubString(SecondComma + 1, Size - SecondComma - 1);
ReturnImage = &GetIcon(Third);
if (!ReturnImage->isEmpty()) return *ReturnImage;
}
// DBG(" Second=%s\n", Second.c_str()); // DBG(" Second=%s\n", Second.c_str());
if (!ReturnImage->isEmpty()) return *ReturnImage; if (!ReturnImage->isEmpty()) return *ReturnImage;
} else { } else {