mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename ttx_font_file => font_file_monospace

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-01-30 21:17:38 +01:00
committed by Thilo Graf
parent c8b5572673
commit d5cebd3a57
6 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -1868,7 +1868,7 @@ FT_Error MyFaceRequester(FTC_FaceID face_id, FT_Library plibrary, FT_Pointer /*r
/******************************************************************************
* Init *
******************************************************************************/
extern std::string ttx_font_file;
extern std::string font_file_monospace;
static bool ft_init_done = false;
static int oldfontheight = 0;
int Init(int source)
@@ -2083,7 +2083,7 @@ int Init(int source)
}
}
#endif
if(!ft_init_done || font_file != ttx_font_file || fontheight != oldfontheight) {
if(!ft_init_done || font_file != font_file_monospace || fontheight != oldfontheight) {
printf("TuxTxt: init fontlibrary\n");
if(ft_init_done) {
FTC_Manager_Done(manager);
@@ -2113,8 +2113,8 @@ int Init(int source)
}
if (usettf) {
printf("TuxTxt: using font %s\n", ttx_font_file.c_str());
typettf.face_id = (FTC_FaceID) ttx_font_file.c_str();
printf("TuxTxt: using font %s\n", font_file_monospace.c_str());
typettf.face_id = (FTC_FaceID) font_file_monospace.c_str();
typettf.height = (FT_UShort) fontheight * TTFHeightFactor16 / 16;
} else {
typettf.face_id = (FTC_FaceID) TUXTXTOTB;
@@ -2131,7 +2131,7 @@ int Init(int source)
FT_Done_FreeType(library);
return 0;
}
font_file = ttx_font_file;
font_file = font_file_monospace;
ft_init_done = true;
oldfontheight = fontheight;