mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-10 09:40:53 +01:00
clean night icon usage bug
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
parent
c209b26511
commit
a9cb692f6e
@ -272,7 +272,9 @@ void XTheme::Init()
|
||||
CharWidth = 9;
|
||||
SelectionColor = 0x80808080;
|
||||
SelectionBackgroundPixel = { 0xef, 0xef, 0xef, 0xff };
|
||||
FontFileName.setEmpty();
|
||||
FontFileName.setEmpty();
|
||||
|
||||
Icons.setEmpty();
|
||||
// Theme.takeValueFrom("embedded");
|
||||
embedded = false;
|
||||
BannerFileName.setEmpty();
|
||||
@ -329,6 +331,7 @@ void XTheme::Init()
|
||||
|
||||
Cinema.setEmpty();
|
||||
}
|
||||
|
||||
TagDict* XTheme::LoadTheme(const XStringW& TestTheme)
|
||||
{
|
||||
EFI_STATUS Status = EFI_UNSUPPORTED;
|
||||
|
@ -3179,7 +3179,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
|
||||
#endif // ENABLE_SECURE_BOOT
|
||||
}
|
||||
}
|
||||
|
||||
MenuEntryOptions.Image.ImageNight.setEmpty();
|
||||
MenuEntryOptions.Image = ThemeX.GetIcon(BUILTIN_ICON_FUNC_OPTIONS);
|
||||
// DBG("Options: IconID=%lld name=%s empty=%s\n", MenuEntryOptions.Image.Id, MenuEntryOptions.Image.Name.c_str(),
|
||||
// MenuEntryOptions.Image.isEmpty()?"пусто":"нет");
|
||||
@ -3187,6 +3187,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
|
||||
MenuEntryOptions.ShortcutLetter = 0x00;
|
||||
MainMenu.AddMenuEntry(&MenuEntryOptions, false);
|
||||
|
||||
MenuEntryAbout.Image.ImageNight.setEmpty();
|
||||
MenuEntryAbout.Image = ThemeX.GetIcon((INTN)BUILTIN_ICON_FUNC_ABOUT);
|
||||
// DBG("About: IconID=%lld name=%s empty=%s\n", MenuEntryAbout.Image.Id, MenuEntryAbout.Image.Name.c_str(),
|
||||
// MenuEntryAbout.Image.isEmpty()?"пусто":"нет");
|
||||
@ -3197,10 +3198,12 @@ RefitMain (IN EFI_HANDLE ImageHandle,
|
||||
if (!(ThemeX.HideUIFlags & HIDEUI_FLAG_FUNCS) || MainMenu.Entries.size() == 0) {
|
||||
if (gSettings.Boot.DisableCloverHotkeys)
|
||||
MenuEntryReset.ShortcutLetter = 0x00;
|
||||
MenuEntryReset.Image.ImageNight.setEmpty();
|
||||
MenuEntryReset.Image = ThemeX.GetIcon(BUILTIN_ICON_FUNC_RESET);
|
||||
MainMenu.AddMenuEntry(&MenuEntryReset, false);
|
||||
if (gSettings.Boot.DisableCloverHotkeys)
|
||||
MenuEntryShutdown.ShortcutLetter = 0x00;
|
||||
MenuEntryShutdown.Image.ImageNight.setEmpty();
|
||||
MenuEntryShutdown.Image = ThemeX.GetIcon(BUILTIN_ICON_FUNC_EXIT);
|
||||
MainMenu.AddMenuEntry(&MenuEntryShutdown, false);
|
||||
}
|
||||
|
@ -1078,7 +1078,9 @@ void ApplyInputs(void)
|
||||
void AboutRefit(void)
|
||||
{
|
||||
if (AboutMenu.Entries.size() == 0) {
|
||||
AboutMenu.Daylight = ThemeX.Daylight;
|
||||
if (!(ThemeX.HideUIFlags & HIDEUI_FLAG_MENU_TITLE_IMAGE)) {
|
||||
AboutMenu.TitleImage.ImageNight.setEmpty();
|
||||
AboutMenu.TitleImage = ThemeX.GetIcon(BUILTIN_ICON_FUNC_ABOUT);
|
||||
}
|
||||
// else {
|
||||
@ -1135,7 +1137,9 @@ void AboutRefit(void)
|
||||
void HelpRefit(void)
|
||||
{
|
||||
if (HelpMenu.Entries.size() == 0) {
|
||||
HelpMenu.Daylight = ThemeX.Daylight;
|
||||
if (!(ThemeX.HideUIFlags & HIDEUI_FLAG_MENU_TITLE_IMAGE)) {
|
||||
HelpMenu.TitleImage.ImageNight.setEmpty();
|
||||
HelpMenu.TitleImage = ThemeX.GetIcon(BUILTIN_ICON_FUNC_HELP);
|
||||
}
|
||||
//else {
|
||||
@ -2598,12 +2602,11 @@ void OptionsMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry)
|
||||
gThemeOptionsChanged = FALSE;
|
||||
|
||||
if (OptionMenu.Entries.size() == 0) {
|
||||
OptionMenu.Daylight = ThemeX.Daylight;
|
||||
if (!(ThemeX.HideUIFlags & HIDEUI_FLAG_MENU_TITLE_IMAGE)) {
|
||||
OptionMenu.TitleImage.ImageNight.setEmpty();
|
||||
OptionMenu.TitleImage = ThemeX.GetIcon(BUILTIN_ICON_FUNC_OPTIONS);
|
||||
}
|
||||
//else {
|
||||
// OptionMenu.TitleImage.setEmpty();
|
||||
//}
|
||||
gThemeOptionsChanged = TRUE;
|
||||
OptionMenu.ID = SCREEN_OPTIONS;
|
||||
OptionMenu.GetAnime(); //FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user