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

Display: rearranges default format; removes scaled resolution

Browse Source
This commit is contained in:
李通洲
2025-09-02 14:15:37 +08:00
parent 8e0a65126e
commit 21b15ee944
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/display/display.c
+16 -12
View File
@@ -101,6 +101,7 @@ bool ffPrintDisplay(FFDisplayOptions* options)
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
double inch = sqrt(result->physicalWidth * result->physicalWidth + result->physicalHeight * result->physicalHeight) / 25.4;
double scaleFactor = (double) result->height / (double) result->scaledHeight;
if(options->moduleArgs.outputFormat.length == 0)
{
@@ -108,23 +109,28 @@ bool ffPrintDisplay(FFDisplayOptions* options)
ffStrbufAppendF(&buffer, "%ix%i", result->width, result->height);
if(result->refreshRate > 0)
{
const char* space = instance.config.display.freqSpaceBeforeUnit == FF_SPACE_BEFORE_UNIT_NEVER ? "" : " ";
if(options->preciseRefreshRate)
ffStrbufAppendF(&buffer, " @ %g%sHz", ((int) (result->refreshRate * 1000 + 0.5)) / 1000.0, space);
else
ffStrbufAppendF(&buffer, " @ %i%sHz", (uint32_t) (result->refreshRate + 0.5), space);
}
if(
result->scaledWidth > 0 && result->scaledWidth != result->width &&
result->scaledHeight > 0 && result->scaledHeight != result->height)
ffStrbufAppendF(&buffer, " (as %ix%i)", result->scaledWidth, result->scaledHeight);
{
ffStrbufAppendS(&buffer, " @ ");
ffStrbufAppendDouble(&buffer, scaleFactor, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);
ffStrbufAppendC(&buffer, 'x');
}
if (inch > 1)
ffStrbufAppendF(&buffer, " in %i\"", (uint32_t) (inch + 0.5));
if(result->refreshRate > 0)
{
ffStrbufAppendS(&buffer, ", ");
if(options->preciseRefreshRate)
ffStrbufAppendDouble(&buffer, result->refreshRate, 3, false);
else
ffStrbufAppendSInt(&buffer, (int) (result->refreshRate + 0.5));
ffStrbufAppendS(&buffer, instance.config.display.freqSpaceBeforeUnit == FF_SPACE_BEFORE_UNIT_NEVER ? "Hz" : " Hz");
}
bool flag = false;
if (result->type != FF_DISPLAY_TYPE_UNKNOWN)
{
@@ -185,8 +191,6 @@ bool ffPrintDisplay(FFDisplayOptions* options)
else
buf[0] = '\0';
double scaleFactor = (double) result->height / (double) result->scaledHeight;
FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, ((FFformatarg[]) {
FF_FORMAT_ARG(result->width, "width"),
FF_FORMAT_ARG(result->height, "height"),