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

Fix compilation of getIcon methods

Browse Source
This commit is contained in:
Jief L 2020-03-29 13:19:05 +03:00
parent 6f46b07534
commit 22b9a6013b
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rEFIt_UEFI/libeg/XTheme.cpp
View File

@ -166,48 +166,43 @@ void XTheme::Init()
* probably it whould return Empty image * probably it whould return Empty image
* Image.isEmpty() == true * Image.isEmpty() == true
*/ */
XImage& XTheme::GetIcon(const char* Name) const XImage& XTheme::GetIcon(const char* Name)
{ {
return GetIcon(XString().takeValueFrom(Name)); return GetIcon(XString().takeValueFrom(Name));
} }
XImage& XTheme::GetIcon(const XString& Name) static XImage NullIcon;
const XImage& XTheme::GetIcon(const XString& Name)
{ {
XImage NullIcon();
XImage* TheIcon = NULL;
for (size_t i = 0; i < Icons.size(); i++) for (size_t i = 0; i < Icons.size(); i++)
{ {
if (Icons[i].Name == Name) //night icon has same name as daylight icon if (Icons[i].Name == Name) //night icon has same name as daylight icon
{ {
if (!Daylight) { if (!Daylight) {
TheIcon = &Icons[i].ImageNight; return Icons[i].ImageNight;
} }
if (TheIcon == NULL || (*TheIcon).isEmpty()) { //if daylight or night icon absent //if daylight or night icon absent
TheIcon = &Icons[i].Image; return Icons[i].Image;
}
return *TheIcon;;
} }
} }
return NullIcon; //return pointer to XImage? Or XImage copy? return NullIcon; //return pointer to XImage? Or XImage copy?
} }
XImage& XTheme::GetIcon(INTN Id) const XImage& XTheme::GetIcon(INTN Id)
{ {
XImage* TheIcon = NULL;
for (size_t i = 0; i < Icons.size(); i++) for (size_t i = 0; i < Icons.size(); i++)
{ {
if (Icons[i].Id == Id) if (Icons[i].Id == Id)
{ {
if (!Daylight) { if (!Daylight) {
TheIcon = &Icons[i].ImageNight; return Icons[i].ImageNight;
} }
if (TheIcon == NULL || (*TheIcon).isEmpty()) { //if daylight or night icon absent //if daylight or night icon absent
TheIcon = &Icons[i].Image; return Icons[i].Image;
}
break;
} }
} }
return TheIcon; return NullIcon;
} }
void XTheme::AddIcon(Icon& NewIcon) void XTheme::AddIcon(Icon& NewIcon)

6
rEFIt_UEFI/libeg/XTheme.h
View File

@ -102,9 +102,9 @@ public:
XImage DownButtonImage; XImage DownButtonImage;
//fill the theme //fill the theme
XImage& GetIcon(const XStringW& Name); //get by name const XImage& GetIcon(const XString& Name); //get by name
XImage& GetIcon(const char* Name); const XImage& GetIcon(const char* Name);
XImage& GetIcon(INTN Id); //get by id const XImage& GetIcon(INTN Id); //get by id
void AddIcon(Icon& NewIcon); //return EFI_STATUS? void AddIcon(Icon& NewIcon); //return EFI_STATUS?
void FillByEmbedded(); void FillByEmbedded();