Keep detected colors when using none logo

#264
This commit is contained in:
Linus Dierheimer
2022-09-27 15:02:35 +02:00
parent 218dffadd3
commit 48300429af
2 changed files with 14 additions and 12 deletions
-12
View File
@@ -38,17 +38,6 @@ const FFlogo* ffLogoBuiltinGetUnknown()
FF_LOGO_RETURN
}
static const FFlogo* getLogoNone()
{
FF_LOGO_INIT
FF_LOGO_NAMES("none", "empty")
FF_LOGO_LINES("")
FF_LOGO_COLORS("")
FF_LOGO_COLOR_KEYS("")
FF_LOGO_COLOR_TITLE("")
FF_LOGO_RETURN
}
static const FFlogo* getLogoAlmaLinux()
{
FF_LOGO_INIT
@@ -1985,7 +1974,6 @@ GetLogoMethod* ffLogoBuiltinGetAll()
{
static GetLogoMethod logoMethods[] = {
ffLogoBuiltinGetUnknown,
getLogoNone,
getLogoAlmaLinux,
getLogoAlpine,
getLogoAlpineSmall,
+14
View File
@@ -236,13 +236,27 @@ static void logoPrintStruct(FFinstance* instance, const FFlogo* logo)
ffLogoPrintChars(instance, logo->data, true);
}
static void logoPrintNone(FFinstance* instance)
{
logoApplyColorsDetected(instance);
instance->state.logoHeight = 0;
instance->state.logoWidth = 0;
}
static bool logoPrintBuiltinIfExists(FFinstance* instance, const char* name)
{
if(strcasecmp(name, "none") == 0)
{
logoPrintNone(instance);
return true;
}
const FFlogo* logo = logoGetBuiltin(name);
if(logo == NULL)
return false;
logoPrintStruct(instance, logo);
return true;
}