mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- change getRenderWidth() default to UTF8

Browse Source
This commit is contained in:
svenhoefer
2014-06-11 11:48:59 +02:00
parent bec2e87412
commit 8b91cda918
35 changed files with 127 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/epgplus.cpp
View File

@@ -186,13 +186,13 @@ void EpgPlus::TimeLine::paint (time_t startTime, int pduration)
std::string timeStr = EpgPlus::getTimeString (tickTime, "%H");
int textWidth = this->fontTime->getRenderWidth (timeStr, true);
int textWidth = this->fontTime->getRenderWidth (timeStr);
this->fontTime->RenderString (xPos - textWidth - 4, this->y + this->fontTime->getHeight()
, textWidth, timeStr, toggleColor ? COL_MENUCONTENT_P1 : COL_MENUCONTENT_P2, 0, true); // UTF-8
timeStr = EpgPlus::getTimeString (tickTime, "%M");
textWidth = this->fontTime->getRenderWidth (timeStr, true);
textWidth = this->fontTime->getRenderWidth (timeStr);
this->fontTime->RenderString (xPos + 4, this->y + this->fontTime->getHeight()
, textWidth, timeStr, toggleColor ? COL_MENUCONTENT_P1 : COL_MENUCONTENT_P2, 0, true); // UTF-8
@@ -223,14 +223,14 @@ void EpgPlus::TimeLine::paintMark (time_t startTime, int pduration, int px, int
// display start time before mark
std::string timeStr = EpgPlus::getTimeString (startTime, "%H:%M");
int textWidth = this->fontTime->getRenderWidth (timeStr, true);
int textWidth = this->fontTime->getRenderWidth (timeStr);
this->fontTime->RenderString (px - textWidth, this->y + this->fontTime->getHeight() + this->fontTime->getHeight()
, textWidth, timeStr, COL_MENUCONTENT_TEXT, 0, true); // UTF-8
// display end time after mark
timeStr = EpgPlus::getTimeString (startTime + pduration, "%H:%M");
textWidth = fontTime->getRenderWidth (timeStr, true);
textWidth = fontTime->getRenderWidth (timeStr);
if (px + pwidth + textWidth < this->x + this->width) {
this->fontTime->RenderString (px + pwidth, this->y + this->fontTime->getHeight() + this->fontTime->getHeight()