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

a step to xtheme

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2020-03-15 23:05:59 +03:00
parent b6d3ddb28f
commit 23fae194bd
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rEFIt_UEFI/refit/menu.cpp
View File

@ -1901,6 +1901,15 @@ VOID InitSelection(VOID)
*/ */
// Radio buttons // Radio buttons
//it was a nonsense egLoadImage is just inluded into egLoadIcon.
// will be corrected with XTheme support
//the procedure loadIcon should also check embedded icons
#if USE_XTHEME
Button[0] = Theme.loadIcon("radio_button.png");
Button[1] = Theme.loadIcon("radio_button_selected.png");
Button[2] = Theme.loadIcon("checkbox.png");
Button[3] = Theme.loadIcon("checkbox_checked.png");
#else
Buttons[0] = egLoadImage(ThemeDir, GetIconsExt(L"radio_button", L"png"), TRUE); //memory leak Buttons[0] = egLoadImage(ThemeDir, GetIconsExt(L"radio_button", L"png"), TRUE); //memory leak
Buttons[1] = egLoadImage(ThemeDir, GetIconsExt(L"radio_button_selected", L"png"), TRUE); Buttons[1] = egLoadImage(ThemeDir, GetIconsExt(L"radio_button_selected", L"png"), TRUE);
if (!Buttons[0]) { if (!Buttons[0]) {
@ -1938,8 +1947,21 @@ VOID InitSelection(VOID)
// DBG("embedded checkbox_checked\n"); // DBG("embedded checkbox_checked\n");
Buttons[3] = egDecodePNG(ACCESS_EMB_DATA(emb_checkbox_checked), ACCESS_EMB_SIZE(emb_checkbox_checked), TRUE); Buttons[3] = egDecodePNG(ACCESS_EMB_DATA(emb_checkbox_checked), ACCESS_EMB_SIZE(emb_checkbox_checked), TRUE);
} }
#endif
// non-selected background images // non-selected background images
#if USE_XTHEME
EFI_GRAPHICS_OUTPUT_BLT_PIXEL& BackgroundPixel;
if (Theme.SelectionBigFileName != NULL) {
BackgroundPixel = &MenuBackgroundPixel;
} else if (GlobalConfig.DarkEmbedded || GlobalConfig.TypeSVG) {
BackgroundPixel = &DarkEmbeddedBackgroundPixel;
} else {
BackgroundPixel = &StdBackgroundPixel;
}
SelectionImages[1] = XImage(row0TileSize, row0TileSize, BackgroundPixel);
SelectionImages[3] = XImage(row1TileSize, row1TileSize, BackgroundPixel);
#else
//totally wrong
if (GlobalConfig.SelectionBigFileName != NULL) { if (GlobalConfig.SelectionBigFileName != NULL) {
SelectionImages[1] = egCreateFilledImage(row0TileSize, row0TileSize, SelectionImages[1] = egCreateFilledImage(row0TileSize, row0TileSize,
TRUE, &MenuBackgroundPixel); TRUE, &MenuBackgroundPixel);
@ -1954,7 +1976,7 @@ VOID InitSelection(VOID)
BackgroundPixel = StdBackgroundPixel; BackgroundPixel = StdBackgroundPixel;
BackgroundPixel.a = 0xff; BackgroundPixel.a = 0xff;
} }
if (GlobalConfig.DarkEmbedded) { if (GlobalConfig.DarkEmbedded) { //nonsense then equal else
SelectionImages[1] = egCreateFilledImage(row0TileSize, row0TileSize, SelectionImages[1] = egCreateFilledImage(row0TileSize, row0TileSize,
TRUE, &BackgroundPixel); TRUE, &BackgroundPixel);
SelectionImages[3] = egCreateFilledImage(row1TileSize, row1TileSize, SelectionImages[3] = egCreateFilledImage(row1TileSize, row1TileSize,
@ -1968,6 +1990,7 @@ VOID InitSelection(VOID)
} }
} }
// DBG("selections inited\n"); // DBG("selections inited\n");
#endif
} }
// //

2
rEFIt_UEFI/refit/screen.cpp
View File

@ -576,7 +576,7 @@ VOID BltClearScreen(IN BOOLEAN ShowBanner) //ShowBanner always TRUE
if (Banner && ShowBanner) { if (Banner && ShowBanner) {
BltImageAlpha(Banner, BannerPlace.XPos, BannerPlace.YPos, &MenuBackgroundPixel, 16); BltImageAlpha(Banner, BannerPlace.XPos, BannerPlace.YPos, &MenuBackgroundPixel, 16);
} }
//what is the idea for the conversion?
InputBackgroundPixel.r = (MenuBackgroundPixel.r + 0) & 0xFF; InputBackgroundPixel.r = (MenuBackgroundPixel.r + 0) & 0xFF;
InputBackgroundPixel.g = (MenuBackgroundPixel.g + 0) & 0xFF; InputBackgroundPixel.g = (MenuBackgroundPixel.g + 0) & 0xFF;
InputBackgroundPixel.b = (MenuBackgroundPixel.b + 0) & 0xFF; InputBackgroundPixel.b = (MenuBackgroundPixel.b + 0) & 0xFF;