From 7b63d53011ad92bfb8ea153b1691ab5ff10a45f8 Mon Sep 17 00:00:00 2001 From: louis Date: Sun, 22 Dec 2013 11:15:42 +0100 Subject: [PATCH] fixed wrong font for clock in horizontal view --- HISTORY | 1 + timeline.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 3b54c2b..38f823c 100644 --- a/HISTORY +++ b/HISTORY @@ -88,3 +88,4 @@ Version 1.1.0 - Added slovakian translation - fixed channel switching with blue key if detailed epg view is opened and if "close tvguide on channel switch" is configured +- fixed wrong font for clock in horizontal view diff --git a/timeline.c b/timeline.c index a6d64cc..0cc41e2 100644 --- a/timeline.c +++ b/timeline.c @@ -247,8 +247,9 @@ void cTimeLine::setTimeline() { void cTimeLine::drawClock() { clock->Fill(clrTransparent); cString currentTime = myTime->GetCurrentTime(); - int textHeight = fontManager.FontTimeLineTime->Height(); - int clockTextWidth = fontManager.FontTimeLineTime->Width(*currentTime); + const cFont *font = (tvguideConfig.displayMode == eVertical)?fontManager.FontTimeLineTime:fontManager.FontTimeLineTimeHorizontal; + int textHeight = font->Height(); + int clockTextWidth = font->Width(*currentTime); tColor colorFontBack = (tvguideConfig.style == eStyleFlat)?theme.Color(clrHeader):clrTransparent; if (tvguideConfig.style == eStyleGraphical) { clock->drawBackgroundGraphical(bgClock); @@ -257,5 +258,5 @@ void cTimeLine::drawClock() { clock->drawBackground(); clock->drawBorder(); } - clock->DrawText(cPoint((geoManager.clockWidth-clockTextWidth)/2, (geoManager.clockHeight-textHeight)/2), *currentTime, theme.Color(clrFont), colorFontBack, fontManager.FontTimeLineTime); + clock->DrawText(cPoint((geoManager.clockWidth-clockTextWidth)/2, (geoManager.clockHeight-textHeight)/2), *currentTime, theme.Color(clrFont), colorFontBack, font); } \ No newline at end of file