From 64bfeeb1e3cd0d8278b1a4c36b1a18bb8bbfc08f Mon Sep 17 00:00:00 2001 From: seife Date: Sun, 7 Feb 2010 17:03:15 +0000 Subject: [PATCH] infoviewer: alignment fixes for curr/next and time git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@295 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/infoviewer.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index a5f66c800..ce0de47d1 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -243,7 +243,7 @@ void CInfoViewer::start () ChanInfoX = BoxStartX + (ChanWidth / 3); time_height = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getHeight()+5; - time_left_width = 2* g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(widest_number); + time_left_width = 2 * g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getWidth(); /* still a kludge */ time_dot_width = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getRenderWidth(":"); time_width = time_left_width* 2+ time_dot_width; @@ -1211,14 +1211,9 @@ void CInfoViewer::display_Info(const char *current, const char *next, int xStart; int InfoX = ChanInfoX + 10; + xStart = InfoX; if (starttimes) - { - xStart = InfoX + info_time_width; - if (xStart < BoxStartX + ChanWidth) /* for small fonts, adjusting to the edge of the */ - xStart = BoxStartX + ChanWidth; /* channelnumberbox looks better */ - } - else - xStart = InfoX; + xStart += info_time_width + 10; if (pb_pos > -1) {