infoviewer.cpp: use templates to get reserved width for current/next info

This should ensure reserved width for all contained text boxes and
and in case of truncated epg info this should be moderate.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bfbb589258
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-03-05 (Mon, 05 Mar 2018)



------------------
This commit was generated by Migit
This commit is contained in:
2018-03-05 21:52:57 +01:00
committed by vanhofen
parent 4b643b5398
commit b56dd4ec4e

View File

@@ -1831,9 +1831,9 @@ void CInfoViewer::display_Info(const char *current, const char *next,
int currTimeW = 0;
int nextTimeW = 0;
if (runningRest)
currTimeW = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth(runningRest) + OFFSET_INNER_MID;
currTimeW = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth("000 / 000 min") + OFFSET_INNER_MID;
if (nextDuration)
nextTimeW = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth(nextDuration) + OFFSET_INNER_MID;
nextTimeW = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->getRenderWidth("000 min") + OFFSET_INNER_MID;
int currTimeX = BoxEndX - currTimeW - OFFSET_INNER_MID;
currTimeX -= analogclock_size + analogclock_offset; //NI
int nextTimeX = BoxEndX - nextTimeW - OFFSET_INNER_MID;