Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct getting of embedded icons in case icon not loaded

Browse Source
This commit is contained in:
asava 2020-04-21 03:39:49 +03:00
parent f7436dffb9
commit 2aca7f3ec3
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rEFIt_UEFI/libeg/XTheme.cpp
View File

@ -352,6 +352,13 @@ const XImage& XTheme::GetIcon(INTN Id) //if not found then take embedded
}
}
}
// icon ID not found in icons array, but in case an embedded exists, get it and add it to icons array
Icon *NewIcon = new Icon(Id, true);
if (!Daylight && !NewIcon->ImageNight.isEmpty()) {
return Icons[Icons.AddReference(NewIcon, true)].ImageNight;
} else if (!NewIcon->Image.isEmpty()) {
return Icons[Icons.AddReference(NewIcon, true)].Image;
}
return NullIcon; //such Id is not found in the database
}
@ -814,11 +821,16 @@ void XTheme::FillByDir() //assume ThemeDir is defined by InitTheme() procedure
if (EFI_ERROR(Status)) {
Status = SelectionImages[4].LoadXImage(ThemeDir, "selection_indicator");
}
if (EFI_ERROR(Status)){
SelectionImages[4] = GetIcon(BUILTIN_ICON_SELECTION);
}
/*
if (EFI_ERROR(Status)) {
INTN ScaledIndicatorSize = (INTN)(INDICATOR_SIZE * Scale);
SelectionImages[4].EnsureImageSize(ScaledIndicatorSize, ScaledIndicatorSize, MenuBackgroundPixel);
SelectionImages[4].Fill(StdBackgroundPixel);
}
*/
}
//and buttons