From 82ed7c1723e246ed5fbf77a2347b0185f34fa9f3 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 6 Jun 2009 15:20:40 +0200
Subject: Fixed calculating menu colum widths in case the font has a size other
 than the default size

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 2 ++
 skins.c      | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index adbd0cad..c2755790 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1227,6 +1227,8 @@ Reinhard Nissl <rnissl@gmx.de>
  to 'double'
  for suggesting to use different names for the Aspect parameter in GetVideoSize()
  and GetOsdSize()
+ for reporting a problem with calculating menu colum widths in case the font has a
+ size other than the default size
 
 Richard Robson <richard_robson@beeb.net>
  for reporting freezing replay if a timer starts while in Transfer Mode from the
diff --git a/HISTORY b/HISTORY
index 4f75111f..b0e05311 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6129,3 +6129,5 @@ Video Disk Recorder Revision History
   (thanks to Ville Skyttä and Ludwig Nussel).
 - Modified cSVDRP::CmdGRAB() to avoid writing into const data (reported by
   Ludwig Nussel).
+- Fixed calculating menu colum widths in case the font has a size other than the
+  default size (reported by Reinhard Nissl).
diff --git a/skins.c b/skins.c
index 46a858cf..a0815e26 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.14 2008/02/17 11:31:09 kls Exp $
+ * $Id: skins.c 2.1 2009/06/06 15:12:31 kls Exp $
  */
 
 #include "skins.h"
@@ -78,8 +78,9 @@ void cSkinDisplayMenu::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5)
   tabs[3] = Tab3 ? tabs[2] + Tab3 : 0;
   tabs[4] = Tab4 ? tabs[3] + Tab4 : 0;
   tabs[5] = Tab5 ? tabs[4] + Tab5 : 0;
+  int AvgCharWidth = Setup.FontOsdSize * 3 / 5; // just an estimate
   for (int i = 1; i < MaxTabs; i++)
-      tabs[i] *= 12;//XXX average character width of font used for items - see also skincurses.c!!!
+      tabs[i] *= AvgCharWidth;
 }
 
 void cSkinDisplayMenu::Scroll(bool Up, bool Page)
-- 
cgit v1.2.3