fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: renames fractionTrailingZeros enum to always/never for consistance

Browse Source
This commit is contained in:
李通洲
2025-09-05 12:27:03 +08:00
parent 390549394d
commit 505ff6ff65
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/json_schema.json
+2 -2
View File
@@ -1356,11 +1356,11 @@
"description": "Use the behavior defined internally"
},
{
"const": "show",
"const": "always",
"description": "Always keep trailing zeros"
},
{
"const": "hide",
"const": "never",
"description": "Never keep trailing zeros"
}
],
src/common/format.c
+2 -2
View File
@@ -32,10 +32,10 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
ffStrbufAppend(buffer, (const FFstrbuf*)formatarg->value);
break;
case FF_FORMAT_ARG_TYPE_FLOAT:
ffStrbufAppendDouble(buffer, *(float*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE);
ffStrbufAppendDouble(buffer, *(float*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER);
break;
case FF_FORMAT_ARG_TYPE_DOUBLE:
ffStrbufAppendDouble(buffer, *(double*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE);
ffStrbufAppendDouble(buffer, *(double*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER);
break;
case FF_FORMAT_ARG_TYPE_BOOL:
ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
src/modules/display/display.c
+1 -1
View File
@@ -114,7 +114,7 @@ bool ffPrintDisplay(FFDisplayOptions* options)
result->scaledHeight > 0 && result->scaledHeight != result->height)
{
ffStrbufAppendS(&buffer, " @ ");
ffStrbufAppendDouble(&buffer, scaleFactor, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);
ffStrbufAppendDouble(&buffer, scaleFactor, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS);
ffStrbufAppendC(&buffer, 'x');
}
src/modules/localip/localip.c
+2 -2
View File
@@ -37,12 +37,12 @@ static void appendSpeed(FFLocalIpResult* ip, FFstrbuf* strbuf)
{
if (ip->speed >= 1000000)
{
ffStrbufAppendDouble(strbuf, ip->speed / 1e6, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);
ffStrbufAppendDouble(strbuf, ip->speed / 1e6, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS);
ffStrbufAppendS(strbuf, " Tbps");
}
else if (ip->speed >= 1000)
{
ffStrbufAppendDouble(strbuf, ip->speed / 1e3, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);
ffStrbufAppendDouble(strbuf, ip->speed / 1e3, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS);
ffStrbufAppendS(strbuf, " Gbps");
}
else
src/options/display.c
+4 -4
View File
@@ -420,8 +420,8 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va
int value;
const char* error = ffJsonConfigParseEnum(trailingZeros, &value, (FFKeyValuePair[]) {
{ "default", FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT },
{ "show", FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW },
{ "hide", FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE },
{ "always", FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS },
{ "never", FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER },
{},
});
if (error) return error;
@@ -755,8 +755,8 @@ bool ffOptionsParseDisplayCommandLine(FFOptionsDisplay* options, const char* key
{
options->fractionTrailingZeros = (FFFractionTrailingZerosType) ffOptionParseEnum(key, value, (FFKeyValuePair[]) {
{ "default", FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT },
{ "show", FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW },
{ "hide", FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE },
{ "always", FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS },
{ "never", FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER },
{},
});
}
src/options/display.h
+2 -2
View File
@@ -28,8 +28,8 @@ typedef enum __attribute__((__packed__)) FFSpaceBeforeUnitType
typedef enum __attribute__((__packed__)) FFFractionTrailingZerosType
{
FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT,
FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW,
FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE,
FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS,
FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER,
} FFFractionTrailingZerosType;
typedef struct FFOptionsDisplay