summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-02-20 11:53:47 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-02-20 11:53:47 +0100
commit343ca17b174b00dc4427aa4e069b066f94373e7b (patch)
tree584622899ff07ba5da1de4ff244cdd7e8e06e68a
parent73314207dcbc5528707fc11b5beaa2b323ce8130 (diff)
downloadvdr-343ca17b174b00dc4427aa4e069b066f94373e7b.tar.gz
vdr-343ca17b174b00dc4427aa4e069b066f94373e7b.tar.bz2
Increased the average character estimate for calculating tab positions in skins, to better suit wide fonts
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--skins.c4
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 72f4a44a..e218203e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -531,6 +531,7 @@ Onno Kreuzinger <ok@solutas.net>
Rudi Hofer (Rudi.Hofer@gmx.de)
for his help in keeping 'channels.conf' up to date
+ for reporting a problem with overlapping tab positions in skins when using wide fonts
Gregoire Favre <greg@ulima.unil.ch>
for fixing some function headers to make them compile with gcc 3.x
diff --git a/HISTORY b/HISTORY
index e2dfa50a..10b83906 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6893,3 +6893,5 @@ Video Disk Recorder Revision History
- The fps value for channels where it differs from the default is now set correctly
when pausing live video.
+- Increased the average character estimate for calculating tab positions in skins,
+ to better suit wide fonts (reported by Rudi Hofer).
diff --git a/skins.c b/skins.c
index 427e4224..ccf8c099 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 2.3 2011/08/21 11:21:19 kls Exp $
+ * $Id: skins.c 2.4 2012/02/20 11:47:15 kls Exp $
*/
#include "skins.h"
@@ -78,7 +78,7 @@ 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
+ int AvgCharWidth = Setup.FontOsdSize * 4 / 6; // just an estimate
for (int i = 1; i < MaxTabs; i++)
tabs[i] *= AvgCharWidth;
}