From e1d7dc8071b51f788fc8e37e9be613cbab1605b5 Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 7 Nov 2013 17:18:00 +0100 Subject: changed channel logos in main menu timers display to scale automatically --- timers.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'timers.c') diff --git a/timers.c b/timers.c index 40e5ae2..1e13681 100644 --- a/timers.c +++ b/timers.c @@ -111,7 +111,7 @@ void cNopacityTimer::CalculateHeight(int space) { height = numLines * lineHeight + 2*space; } else { int lineHeight = font->Height(); - height = config.GetValue("timersLogoHeight") + (numLines +1)* lineHeight + 2*space; + height = geoManager->menuTimersLogoHeight + (numLines +1)* lineHeight + 2*space; } } @@ -164,10 +164,10 @@ void cNopacityTimer::Render(void) { } } - pixmapText->DrawText(cPoint(5, config.GetValue("timersLogoHeight")), *Date, Theme.Color(clrMenuFontTimersHeader), clrTransparent, fontLarge); + pixmapText->DrawText(cPoint(5, geoManager->menuTimersLogoHeight), *Date, Theme.Color(clrMenuFontTimersHeader), clrTransparent, fontLarge); int lineHeight = font->Height(); - int yStart = config.GetValue("timersLogoHeight") + lineHeight + 3; + int yStart = geoManager->menuTimersLogoHeight + lineHeight + 3; int numLines = showName.Lines(); for (int line=0; lineDrawText(cPoint(5, yStart+line*(lineHeight-2)), showName.GetLine(line), Theme.Color(clrMenuFontTimers), clrTransparent, font); @@ -177,8 +177,8 @@ void cNopacityTimer::Render(void) { void cNopacityTimer::DrawLogo(void) { pixmapLogo->Fill(clrTransparent); int showTimerLogo = (config.GetValue("showTimers") < 2) ? 1 : 0; - int logoWidth = config.GetValue("timersLogoWidth"); - int logoHeight = config.GetValue("timersLogoHeight"); + int logoWidth = geoManager->menuTimersLogoWidth; + int logoHeight = geoManager->menuTimersLogoHeight; const cChannel *Channel = timer->Channel(); if (Channel) { bool logoFound = false; -- cgit v1.2.3