Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-01-12 19:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

some string corrections

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2020-03-29 11:07:59 +03:00
parent 443ad8ee3e
commit 6ca8e4426b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rEFIt_UEFI/libeg/VectorGraphics.cpp
View File

@ -451,23 +451,23 @@ EFI_STATUS ParseSVGXTheme(CONST CHAR8* buffer, TagPtr * dict)
} }
Status = EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
if (!DayLight) { if (!DayLight) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BACKGROUND, "Background_night", Scale, ThemeX.BigBack); Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BACKGROUND, &XString().takeValueFrom("Background_night"), Scale, ThemeX.BigBack);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BACKGROUND, "Background", Scale, ThemeX.BigBack); Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BACKGROUND, XString().takeValueFrom("Background"), Scale, ThemeX.BigBack);
} }
DBG(" Background parsed\n"); DBG(" Background parsed\n");
// --- Make Banner // --- Make Banner
ThemeX.Banner.setEmpty(); //for the case of theme switch ThemeX.Banner.setEmpty(); //for the case of theme switch
Status = EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
if (!DayLight) { if (!DayLight) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BANNER, "Banner_night", Scale, ThemeX.Banner); Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BANNER, XString().takeValueFrom("Banner_night"), Scale, ThemeX.Banner);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BANNER, "Banner", Scale, ThemeX.Banner); Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BANNER, XString().takeValueFrom("Banner"), Scale, ThemeX.Banner);
} }
DBG("Banner parsed\n"); DBG("Banner parsed\n");
BanHeight = (int)(ThemeX.Banner.GetHeight() * Scale + 1.f); ThemeX.BanHeight = (int)(ThemeX.Banner.GetHeight() * Scale + 1.f);
DBG(" parsed banner->width=%lld\n", ThemeX.Banner.GetWidth()); DBG(" parsed banner->width=%lld\n", ThemeX.Banner.GetWidth());
// --- Make other icons // --- Make other icons
@ -486,10 +486,10 @@ EFI_STATUS ParseSVGXTheme(CONST CHAR8* buffer, TagPtr * dict)
//selection for bootcamp style //selection for bootcamp style
Status = EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
if (!DayLight) { if (!DayLight) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_SELECTION, XString("selection_indicator_night"), Scale, SelectionImages[4]); Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_SELECTION, XString().takeValueFrom("selection_indicator_night"), Scale, SelectionImages[4]);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_SELECTION, XString("selection_indicator"), Scale, SelectionImages[4]); Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_SELECTION, XString().takeValueFrom("selection_indicator"), Scale, SelectionImages[4]);
} }
//banner animation //banner animation
@ -702,7 +702,6 @@ EFI_STATUS ParseSVGTheme(CONST CHAR8* buffer, TagPtr * dict)
} }
DBG("parsing theme finish\n"); DBG("parsing theme finish\n");
#endif
return EFI_SUCCESS; return EFI_SUCCESS;
} }

2
rEFIt_UEFI/libeg/libeg.h
View File

@ -37,7 +37,7 @@
#ifndef __LIBEG_LIBEG_H__ #ifndef __LIBEG_LIBEG_H__
#define __LIBEG_LIBEG_H__ #define __LIBEG_LIBEG_H__
#define USE_XTHEME 0 #define USE_XTHEME 1
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {