summaryrefslogtreecommitdiff
path: root/osd.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-06-02 13:35:54 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-06-02 13:35:54 +0200
commit2de28295fc899065d6be129a2294cf5554cb717b (patch)
tree046fc4aeeceedf2e2de9b94737593a4933153bb3 /osd.c
parenteec6b1d818a4a568ca6def00565beed8c301ecab (diff)
downloadvdr-2de28295fc899065d6be129a2294cf5554cb717b.tar.gz
vdr-2de28295fc899065d6be129a2294cf5554cb717b.tar.bz2
Now making sure that the "small font" is never larger than the "osd font"
Diffstat (limited to 'osd.c')
-rw-r--r--osd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/osd.c b/osd.c
index 2edf4fae..37ee310e 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -2006,7 +2006,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP));
cFont::SetFont(fontOsd, Setup.FontOsd, Setup.FontOsdSize);
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;
oldHeight = Height;
oldAspect = Aspect;