mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32909483ef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-08 (Mon, 08 Apr 2013)

Origin message was:
------------------
src/gui/epgview.cpp: fixes from tuxbox, THX Gaucho316 & GetAway

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2013-04-08 17:42:37 +02:00
committed by [CST] Focus
parent 1fff9ec3fb
commit f65d5892de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/epgview.cpp
View File

@@ -224,10 +224,10 @@ void CEpgData::showText( int startPos, int ypos )
int max_mon_w = 0, max_wday_w = 0; int max_mon_w = 0, max_wday_w = 0;
int digi = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth("29.."); int digi = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth("29..");
for(int i = 0; i < 12;i++){ for(int i = 0; i < 12;i++){
max_mon_w = std::max(max_mon_w ,g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(g_Locale->getText(CLocaleManager::getMonth(i)))); max_mon_w = std::max(max_mon_w ,g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getMonth(i))) + ".", true)); // UTF-8
if(i > 6) if(i > 6)
continue; continue;
max_wday_w = std::max(max_wday_w ,g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(g_Locale->getText(CLocaleManager::getWeekday(i)))); max_wday_w = std::max(max_wday_w ,g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(std::string(g_Locale->getText(CLocaleManager::getWeekday(i))) + ".", true)); // UTF-8
} }
frameBuffer->paintBoxRel(sx, y, ox- 15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box frameBuffer->paintBoxRel(sx, y, ox- 15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box
for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight) for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight)
@@ -872,7 +872,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() / BIG_FONT_FAKTOR)); g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() / BIG_FONT_FAKTOR));
} }
g_settings.bigFonts = bigFonts; g_settings.bigFonts = bigFonts;
show(channel_id, id, &startzeit, false); show(channel_id, id, &startzeit, false, call_fromfollowlist);
showPos=0; showPos=0;
break; break;