Logo (Chafa): fixes setting logo.width with chafa

CarterLi · CarterLi · commit 37ab380a6fa7 · 2025-09-03T10:49:58.000+08:00
Regression in v2.51.0 Fixes #1947
diff --git a/src/logo/logo.c b/src/logo/logo.c
@@ -114,7 +114,7 @@ static bool ffLogoPrintCharsRaw(const char* data, size_t length, bool printError
 static uint32_t logoAppendChars(const char* data, bool doColorReplacement, FFstrbuf* result)
 {
     FFOptionsLogo* options = &instance.config.logo;
-    uint32_t currentlineLength = options->width;
+    uint32_t currentlineLength = options->type == FF_LOGO_TYPE_IMAGE_CHAFA ? 0 : options->width; // For chafa, unit of options->width is pixels
     uint32_t logoHeight = 0;
 
     if (result)
@@ -260,7 +260,7 @@ static uint32_t logoAppendChars(const char* data, bool doColorReplacement, FFstr
     if(currentlineLength > instance.state.logoWidth)
         instance.state.logoWidth = currentlineLength;
 
-    return options->height > logoHeight ? options->height : logoHeight;
+    return options->type != FF_LOGO_TYPE_IMAGE_CHAFA && options->height > logoHeight ? options->height : logoHeight;
 }
 
 void ffLogoPrintChars(const char* data, bool doColorReplacement)

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ static bool ffLogoPrintCharsRaw(const char* data, size_t length, bool printError`
`114`	`114`	`static uint32_t logoAppendChars(const char* data, bool doColorReplacement, FFstrbuf* result)`
`115`	`115`	`{`
`116`	`116`	`FFOptionsLogo* options = &instance.config.logo;`
`117`		`- uint32_t currentlineLength = options->width;`
	`117`	`+ uint32_t currentlineLength = options->type == FF_LOGO_TYPE_IMAGE_CHAFA ? 0 : options->width; // For chafa, unit of options->width is pixels`
`118`	`118`	`uint32_t logoHeight = 0;`
`119`	`119`
`120`	`120`	`if (result)`
`@@ -260,7 +260,7 @@ static uint32_t logoAppendChars(const char* data, bool doColorReplacement, FFstr`
`260`	`260`	`if(currentlineLength > instance.state.logoWidth)`
`261`	`261`	`instance.state.logoWidth = currentlineLength;`
`262`	`262`
`263`		`- return options->height > logoHeight ? options->height : logoHeight;`
	`263`	`+ return options->type != FF_LOGO_TYPE_IMAGE_CHAFA && options->height > logoHeight ? options->height : logoHeight;`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`void ffLogoPrintChars(const char* data, bool doColorReplacement)`