frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented cFont::CreateFont()

Browse Source
This commit is contained in:
Klaus Schmidinger
2007-06-17 12:15:24 +02:00
parent 5fec367e60
commit d2b11bf712
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
font.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: font.c 1.18 2007/06/17 11:54:10 kls Exp $
* $Id: font.c 1.19 2007/06/17 12:13:49 kls Exp $
*/
#include "font.h"
@@ -309,15 +309,11 @@ cFont *cFont::fonts[eDvbFontSize] = { NULL };
void cFont::SetFont(eDvbFont Font, const char *Name, int CharHeight)
{
cString fn = GetFontFileName(Name);
if (*fn) {
delete fonts[Font];
fonts[Font] = new cFreetypeFont(fn, CharHeight);
}
if (!fonts[Font] || !fonts[Font]->Height()) {
delete fonts[Font];
fonts[Font] = new cDummyFont;
}
cFont *f = CreateFont(Name, CharHeight);
if (!f || !f->Height())
f = new cDummyFont;
delete fonts[Font];
fonts[Font] = f;
}
const cFont *cFont::GetFont(eDvbFont Font)
@@ -336,6 +332,14 @@ const cFont *cFont::GetFont(eDvbFont Font)
return fonts[Font];
}
cFont *cFont::CreateFont(const char *Name, int CharHeight)
{
cString fn = GetFontFileName(Name);
if (*fn)
return new cFreetypeFont(fn, CharHeight);
return NULL;
}
bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
{
if (!FontNames->Size()) {