From dcdf2b570eb8d669c4519381225452106700a4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 15 Nov 2024 20:01:56 +0800 Subject: [PATCH] Display: concat flags --- src/modules/display/display.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 08aa89eea..6c720f31b 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -124,11 +124,21 @@ void ffPrintDisplay(FFDisplayOptions* options) if (inch > 1) ffStrbufAppendF(&buffer, " in %i\"", (uint32_t) (inch + 0.5)); - if(result->type != FF_DISPLAY_TYPE_UNKNOWN) - ffStrbufAppendS(&buffer, result->type == FF_DISPLAY_TYPE_BUILTIN ? " [Built-in]" : " [External]"); + bool flag = false; + if (result->type != FF_DISPLAY_TYPE_UNKNOWN) + { + ffStrbufAppendS(&buffer, result->type == FF_DISPLAY_TYPE_BUILTIN ? " [Built-in" : " [External"); + flag = true; + } if (result->hdrStatus == FF_DISPLAY_HDR_STATUS_ENABLED) - ffStrbufAppendS(&buffer, " [HDR]"); + { + ffStrbufAppendS(&buffer, flag ? ", HDR" : " [HDR"); + flag = true; + } + + if (flag) + ffStrbufAppendS(&buffer, "]"); if(moduleIndex > 0 && result->primary) ffStrbufAppendS(&buffer, " *");