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

Correct theme change, correct vector theme assignment

Browse Source
This commit is contained in:
asava 2020-04-15 23:12:43 +03:00
parent fe29494120
commit 6e1f5206b8
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rEFIt_UEFI/libeg/VectorGraphics.cpp
View File

@ -54,11 +54,11 @@ extern BOOLEAN DayLight;
textFaces textFace[4]; //0-help 1-message 2-menu 3-test, far future it will be infinite list with id textFaces textFace[4]; //0-help 1-message 2-menu 3-test, far future it will be infinite list with id
EFI_STATUS XTheme::ParseSVGXIcon(void * pars, INTN Id, const XString& IconNameX, XImage* Image) EFI_STATUS XTheme::ParseSVGXIcon(INTN Id, const XString& IconNameX, XImage* Image)
{ {
EFI_STATUS Status = EFI_NOT_FOUND; EFI_STATUS Status = EFI_NOT_FOUND;
NSVGimage *SVGimage; NSVGimage *SVGimage;
NSVGparser *p = (NSVGparser *)pars; NSVGparser *p = (NSVGparser *)SVGParser;
NSVGrasterizer* rast = nsvgCreateRasterizer(); NSVGrasterizer* rast = nsvgCreateRasterizer();
SVGimage = p->image; SVGimage = p->image;
NSVGshape *shape; NSVGshape *shape;
@ -234,12 +234,13 @@ EFI_STATUS XTheme::ParseSVGXTheme(CONST CHAR8* buffer)
{ {
EFI_STATUS Status; EFI_STATUS Status;
NSVGimage *SVGimage; NSVGimage *SVGimage;
NSVGparser *mainParser = (NSVGparser*)SVGParser; NSVGparser *mainParser;
Icons.Empty(); Icons.Empty();
// --- Parse theme.svg --- low case // --- Parse theme.svg --- low case
mainParser = nsvgParse((CHAR8*)buffer, 72, 1.f); //the buffer will be modified, it is how nanosvg works SVGParser = (void *)nsvgParse((CHAR8*)buffer, 72, 1.f); //the buffer will be modified, it is how nanosvg works
mainParser = (NSVGparser*)SVGParser;
SVGimage = mainParser->image; SVGimage = mainParser->image;
if (!SVGimage) { if (!SVGimage) {
DBG("Theme not parsed!\n"); DBG("Theme not parsed!\n");
@ -272,20 +273,20 @@ EFI_STATUS XTheme::ParseSVGXTheme(CONST CHAR8* buffer)
} }
Status = EFI_NOT_FOUND; Status = EFI_NOT_FOUND;
if (!DayLight) { if (!DayLight) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BACKGROUND, "Background_night"_XS, &BigBack); Status = ParseSVGXIcon(BUILTIN_ICON_BACKGROUND, "Background_night"_XS, &BigBack);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BACKGROUND, "Background"_XS, &BigBack); Status = ParseSVGXIcon(BUILTIN_ICON_BACKGROUND, "Background"_XS, &BigBack);
} }
DBG(" Background parsed [%lld, %lld]\n", BigBack.GetWidth(), BigBack.GetHeight()); //Background parsed [1067, 133] DBG(" Background parsed [%lld, %lld]\n", BigBack.GetWidth(), BigBack.GetHeight()); //Background parsed [1067, 133]
// --- Make Banner // --- Make Banner
Banner.setEmpty(); //for the case of theme switch 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"_XS, &Banner); Status = ParseSVGXIcon(BUILTIN_ICON_BANNER, "Banner_night"_XS, &Banner);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_BANNER, "Banner"_XS, &Banner); Status = ParseSVGXIcon(BUILTIN_ICON_BANNER, "Banner"_XS, &Banner);
} }
DBG("Banner parsed\n"); DBG("Banner parsed\n");
BanHeight = (int)(Banner.GetHeight() * Scale + 1.f); BanHeight = (int)(Banner.GetHeight() * Scale + 1.f);
@ -298,14 +299,14 @@ EFI_STATUS XTheme::ParseSVGXTheme(CONST CHAR8* buffer)
continue; continue;
} }
Icon* NewIcon = new Icon(i, false); //initialize without embedded Icon* NewIcon = new Icon(i, false); //initialize without embedded
Status = ParseSVGXIcon(mainParser, i, NewIcon->Name, &NewIcon->Image); Status = ParseSVGXIcon(i, NewIcon->Name, &NewIcon->Image);
if (EFI_ERROR(Status) && if (EFI_ERROR(Status) &&
(i >= BUILTIN_ICON_VOL_INTERNAL_HFS) && (i >= BUILTIN_ICON_VOL_INTERNAL_HFS) &&
(i <= BUILTIN_ICON_VOL_INTERNAL_REC)) { (i <= BUILTIN_ICON_VOL_INTERNAL_REC)) {
NewIcon->Image = GetIcon(BUILTIN_ICON_VOL_INTERNAL); //copy existing NewIcon->Image = GetIcon(BUILTIN_ICON_VOL_INTERNAL); //copy existing
} }
// DBG("parse %s status %s\n", NewIcon->Name.c_str(), strerror(Status)); // DBG("parse %s status %s\n", NewIcon->Name.c_str(), strerror(Status));
Status = ParseSVGXIcon(mainParser, i, NewIcon->Name + "_night"_XS, &NewIcon->ImageNight); Status = ParseSVGXIcon(i, NewIcon->Name + "_night"_XS, &NewIcon->ImageNight);
// DBG("...night status %s\n", strerror(Status)); // DBG("...night status %s\n", strerror(Status));
if (EFI_ERROR(Status) && if (EFI_ERROR(Status) &&
(i >= BUILTIN_ICON_VOL_INTERNAL_HFS) && (i >= BUILTIN_ICON_VOL_INTERNAL_HFS) &&
@ -327,10 +328,10 @@ EFI_STATUS XTheme::ParseSVGXTheme(CONST CHAR8* buffer)
//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, "selection_indicator_night"_XS, &SelectionImages[4]); Status = ParseSVGXIcon(BUILTIN_ICON_SELECTION, "selection_indicator_night"_XS, &SelectionImages[4]);
} }
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
Status = ParseSVGXIcon(mainParser, BUILTIN_ICON_SELECTION, "selection_indicator"_XS, &SelectionImages[4]); Status = ParseSVGXIcon(BUILTIN_ICON_SELECTION, "selection_indicator"_XS, &SelectionImages[4]);
} }
//buttons //buttons
@ -377,7 +378,7 @@ EFI_STATUS XTheme::LoadSvgFrame(INTN i, OUT XImage* XFrame)
{ {
EFI_STATUS Status = EFI_NOT_FOUND; EFI_STATUS Status = EFI_NOT_FOUND;
XString XFrameName = SPrintf("frame_%04lld", i+1); XString XFrameName = SPrintf("frame_%04lld", i+1);
Status = ParseSVGXIcon(SVGParser, BUILTIN_ICON_ANIME, XFrameName, XFrame); Status = ParseSVGXIcon(BUILTIN_ICON_ANIME, XFrameName, XFrame);
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
DBG("frame '%s' not loaded, status=%s\n", XFrameName.c_str(), strerror(Status)); DBG("frame '%s' not loaded, status=%s\n", XFrameName.c_str(), strerror(Status));
} }

2
rEFIt_UEFI/libeg/XTheme.cpp
View File

@ -218,6 +218,7 @@ void XTheme::Init()
Font = FONT_GRAY; // FONT_TYPE Font = FONT_GRAY; // FONT_TYPE
CharWidth = 9; CharWidth = 9;
SelectionColor = 0x80808080; SelectionColor = 0x80808080;
SelectionBackgroundPixel = { 0xef, 0xef, 0xef, 0xff };
FontFileName.setEmpty(); FontFileName.setEmpty();
Theme.takeValueFrom("embedded"); Theme.takeValueFrom("embedded");
embedded = true; embedded = true;
@ -244,6 +245,7 @@ void XTheme::Init()
BannerEdgeVertical = 0; BannerEdgeVertical = 0;
BannerNudgeX = 0; BannerNudgeX = 0;
BannerNudgeY = 0; BannerNudgeY = 0;
BanHeight = 0;
VerticalLayout = FALSE; VerticalLayout = FALSE;
NonSelectedGrey = FALSE; //TODO what about SVG? NonSelectedGrey = FALSE; //TODO what about SVG?
MainEntriesSize = 128; MainEntriesSize = 128;

2
rEFIt_UEFI/libeg/XTheme.h
View File

@ -150,7 +150,7 @@ public:
EFI_STATUS GetThemeTagSettings(void* DictPointer); EFI_STATUS GetThemeTagSettings(void* DictPointer);
void parseTheme(void* p, const char** dict); //in nano project void parseTheme(void* p, const char** dict); //in nano project
EFI_STATUS ParseSVGXTheme(const CHAR8* buffer); // in VectorTheme EFI_STATUS ParseSVGXTheme(const CHAR8* buffer); // in VectorTheme
EFI_STATUS ParseSVGXIcon(void* p, INTN Id, const XString& IconNameX, XImage* Image); EFI_STATUS ParseSVGXIcon(INTN Id, const XString& IconNameX, XImage* Image);
void* LoadTheme(const CHAR16 *TestTheme); //return TagPtr why? void* LoadTheme(const CHAR16 *TestTheme); //return TagPtr why?
EFI_STATUS LoadSvgFrame(INTN i, OUT XImage* XFrame); // for animation EFI_STATUS LoadSvgFrame(INTN i, OUT XImage* XFrame); // for animation

1
rEFIt_UEFI/refit/main.cpp
View File

@ -2503,6 +2503,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
gThemeNeedInit = FALSE; gThemeNeedInit = FALSE;
} else if (gThemeChanged) { } else if (gThemeChanged) {
DBG("change theme\n"); DBG("change theme\n");
ThemeX.FillByEmbedded();
InitTheme(FALSE, NULL); InitTheme(FALSE, NULL);
OptionMenu.FreeMenu(); OptionMenu.FreeMenu();
} }