From ff3b2f227efe5aeeff8d6905a53d3cdc4369b38a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 8 Jan 2018 10:15:39 +0100 Subject: [PATCH] infoviewer: fix FIXME comment from previous commit Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/62c474eaba0cefe3c3c0ce0e7fa2a583d0cf3f55 Author: vanhofen Date: 2018-01-08 (Mon, 08 Jan 2018) Origin message was: ------------------ - infoviewer: fix FIXME comment from previous commit ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 46646524a..1a9ff39fb 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -854,17 +854,19 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap if ((!logo_ok && g_settings.infobar_show_channellogo < 2) || g_settings.infobar_show_channellogo == 2 || g_settings.infobar_show_channellogo == 4) // no logo in numberbox { // show number in numberbox - int h_tmp = numbox->getHeight(); - int y_tmp = numbox->getYPos() + 5*100/h_tmp; //5% - if (g_settings.infobar_sat_display){ + int h_tmp = numbox->getHeight(); + int y_tmp = numbox->getYPos() + OFFSET_INNER_MIN; + int w_tmp = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getRenderWidth(strChanNum); + if (g_settings.infobar_sat_display) + { int h_sfont = g_SignalFont->getHeight(); h_tmp -= h_sfont; y_tmp += h_sfont; } y_tmp += h_tmp/2 + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getHeight()/2; - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->RenderString(BoxStartX + numbox_offset + (numbox_maxtxtwidth - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->getRenderWidth(strChanNum))/2, + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_NUMBER]->RenderString(BoxStartX + numbox_offset + (numbox_maxtxtwidth - w_tmp)/2, y_tmp, - numbox_maxtxtwidth, //FIXME: this value is definitely wrong here! We need to get render width from strChanNum. + w_tmp, strChanNum, col_NumBoxText, 0, renderFlag); }