frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Now making sure that the "small font" is never larger than the "osd font"

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-06-02 13:35:54 +02:00
parent eec6b1d818
commit 2de28295fc
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -7137,3 +7137,4 @@ Video Disk Recorder Revision History
(in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin). (in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin).
- Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS - Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
and LEGACY_CRECEIVER. and LEGACY_CRECEIVER.
- Now making sure that the "small font" is never larger than the "osd font".

4
font.c
View File

@ -6,7 +6,7 @@
* *
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya. * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
* *
* $Id: font.c 2.11 2012/05/19 10:15:18 kls Exp $ * $Id: font.c 2.12 2012/06/02 13:32:19 kls Exp $
*/ */
#include "font.h" #include "font.h"
@ -412,7 +412,7 @@ const cFont *cFont::GetFont(eDvbFont Font)
if (!fonts[Font]) { if (!fonts[Font]) {
switch (Font) { switch (Font) {
case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break; case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break;
case fontSml: SetFont(Font, Setup.FontSml, Setup.FontSmlSize); break; case fontSml: SetFont(Font, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize)); break;
case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break; case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break;
default: esyslog("ERROR: unknown Font %d (%s %d)", Font, __FUNCTION__, __LINE__); default: esyslog("ERROR: unknown Font %d (%s %d)", Font, __FUNCTION__, __LINE__);
} }

4
osd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: osd.c 2.30 2012/06/02 10:42:23 kls Exp $ * $Id: osd.c 2.31 2012/06/02 13:32:38 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -2006,7 +2006,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP)); Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP));
cFont::SetFont(fontOsd, Setup.FontOsd, Setup.FontOsdSize); cFont::SetFont(fontOsd, Setup.FontOsd, Setup.FontOsdSize);
cFont::SetFont(fontFix, Setup.FontFix, Setup.FontFixSize); cFont::SetFont(fontFix, Setup.FontFix, Setup.FontFixSize);
cFont::SetFont(fontSml, Setup.FontSml, Setup.FontSmlSize); cFont::SetFont(fontSml, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize));
oldWidth = Width; oldWidth = Width;
oldHeight = Height; oldHeight = Height;
oldAspect = Aspect; oldAspect = Aspect;