Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-12 09:54:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some (not all) compilation issues fixed.

Browse Source
This commit is contained in:
Jief L 2020-03-21 14:43:45 +03:00
parent 38d061d970
commit 35e2eec3cc
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rEFIt_UEFI/libeg/XTheme.cpp
View File

@ -137,10 +137,10 @@ void XTheme::Init()
XImage& XTheme::GetIcon(const char* Name)
{
return GetIcon(XStringWP(Name));
return GetIcon(XStringW().takeValueFrom(Name));
}
XImage& XTheme::GetIcon(XStringW& Name)
XImage& XTheme::GetIcon(const XStringW& Name)
{
XImage* TheIcon = NULL;
for (size_t i = 0; i < Icons.size(); i++)
@ -502,7 +502,7 @@ void XTheme::InitSelection()
if (EFI_ERROR(Status)) {
Button[0].FromPNG(ACCESS_EMB_DATA(emb_radio_button), ACCESS_EMB_SIZE(emb_radio_button));
}
Status = Button[1].LoadXImage(ThemeDir, "radio_button_selected"));
Status = Button[1].LoadXImage(ThemeDir, "radio_button_selected");
if (EFI_ERROR(Status)) {
Button[1].FromPNG(ACCESS_EMB_DATA(emb_radio_button_selected), ACCESS_EMB_SIZE(emb_radio_button_selected));
}
@ -517,7 +517,7 @@ void XTheme::InitSelection()
// non-selected background images
EFI_GRAPHICS_OUTPUT_BLT_PIXEL& BackgroundPixel = { 0xbf, 0xbf, 0xbf, 0xff };
EFI_GRAPHICS_OUTPUT_BLT_PIXEL BackgroundPixel = { 0xbf, 0xbf, 0xbf, 0xff };
if (!SelectionBigFileName.isEmpty()) {
BackgroundPixel = { 0x00, 0x00, 0x00, 0x00 };
} else if (DarkEmbedded || TypeSVG) {
@ -526,9 +526,9 @@ void XTheme::InitSelection()
BackgroundPixel = { 0xbf, 0xbf, 0xbf, 0xff };
}
SelectionImages[1] = XImage(row0TileSize, row0TileSize);
SelectionImages[1].Fill((EFI_GRAPHICS_OUTPUT_BLT_PIXEL&)BackgroundPixel);
SelectionImages[1].Fill(BackgroundPixel);
SelectionImages[3] = XImage(row1TileSize, row1TileSize);
SelectionImages[3].Fill((EFI_GRAPHICS_OUTPUT_BLT_PIXEL&)BackgroundPixel);
SelectionImages[3].Fill(BackgroundPixel);
}
@ -537,14 +537,14 @@ void XTheme::FillByDir() //assume ThemeDir is defined by InitTheme() procedure
{
for (INTN i = 0; i < BUILTIN_ICON_COUNT; ++i) {
Icon NewIcon(i, true); //initialize with embedded but further replace by loaded
NewIcon.Image.LoadXImage(ThemeDir, IconsNames[i]));
NewIcon.ImageNight.LoadXImage(ThemeDir, XStringWP(IconsNames[i]) + "_night");
NewIcon.Image.LoadXImage(ThemeDir, IconsNames[i]);
NewIcon.ImageNight.LoadXImage(ThemeDir, XStringWP(IconsNames[i]) + XStringWP("_night"));
Icons.AddCopy(NewIcon);
}
for (INTN i = BUILTIN_ICON_COUNT; i < 45; ++i) {
Icon NewIcon(i); //there is no embedded
NewIcon.Image.LoadXImage(ThemeDir, IconsNames[i])); //all os_***
NewIcon.Image.LoadXImage(ThemeDir, IconsNames[i]); //all os_***
Icons.AddCopy(NewIcon);
}

4
rEFIt_UEFI/libeg/XTheme.h
View File

@ -18,6 +18,7 @@ public:
XImage ImageNight;
Icon(INTN Id);
Icon(INTN Index, BOOLEAN Embedded);
~Icon();
};
@ -95,12 +96,13 @@ public:
XImage DownButtonImage;
//fill the theme
XImage& GetIcon(XStringW& Name); //get by name
XImage& GetIcon(const XStringW& Name); //get by name
XImage& GetIcon(const char* Name);
XImage& GetIcon(INTN Id); //get by id
void AddIcon(Icon& NewIcon); //return EFI_STATUS?
void FillByEmbedded();
void FillByDir();
//screen operations
void ClearScreen();