From 23bf7a407bc16c60aab30633d6371642eb183fae Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Wed, 20 Jul 2022 20:56:02 +0200 Subject: [PATCH] Fix alacritty term font size #197 --- src/common/font.c | 10 +++++++++- src/fastfetch.h | 1 + src/modules/terminalfont.c | 6 +----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/common/font.c b/src/common/font.c index e2b13ba46..bc5af5a03 100644 --- a/src/common/font.c +++ b/src/common/font.c @@ -188,13 +188,21 @@ void ffFontInitPango(FFfont* font, const char* data) fontInitPretty(font); } -void ffFontInitCopy(FFfont* font, const char* name) +void ffFontInitValues(FFfont* font, const char* name, const char* size) { fontInit(font); + ffStrbufAppendS(&font->name, name); + ffStrbufAppendS(&font->size, size); + fontInitPretty(font); } +void ffFontInitCopy(FFfont* font, const char* name) +{ + ffFontInitValues(font, name, NULL); +} + void ffFontDestroy(FFfont* font) { ffStrbufDestroy(&font->pretty); diff --git a/src/fastfetch.h b/src/fastfetch.h index 0c0a483e4..7492d2595 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -466,6 +466,7 @@ bool ffParsePropFileConfig(const FFinstance* instance, const char* relativeFile, void ffFontInitQt(FFfont* font, const char* data); void ffFontInitPango(FFfont* font, const char* data); void ffFontInitCopy(FFfont* font, const char* name); +void ffFontInitValues(FFfont* font, const char* name, const char* size); void ffFontDestroy(FFfont* font); //common/format.c diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index 66f3f7e92..26d5d6943 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -206,11 +206,7 @@ static void printAlacritty(FFinstance* instance) { ffStrbufAppendS(&fontSize, "11"); FFfont font; - ffFontInitCopy(&font, fontName.chars); - - if(fontSize.length > 0) - ffStrbufSet(&font.size, &fontSize); - + ffFontInitValues(&font, fontName.chars, fontSize.chars); printTerminalFont(instance, fontName.chars, &font); ffFontDestroy(&font);