From e8eea47e30d8b2012e46a785f96bed69c6ce8cb1 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 8 Apr 2013 20:41:36 +0200 Subject: [PATCH] src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5d214c2fe44e103ad370ba24a1ae475bed8504fd Author: Jacek Jendrzej Date: 2013-04-08 (Mon, 08 Apr 2013) Origin message was: ------------------ src/gui/epgview.cpp: fixes2 from tuxbox, THX Gaucho316 ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgview.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 54edb904b..657194135 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -735,7 +735,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start case CRCInput::RC_up: showPos -= scrollCount; if (showPos<0) - showPos = 0; + showPos=0; else showText(showPos, sy + toph); break; @@ -759,7 +759,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start strcpy(recDir, b.getSelectedFile()->Name.c_str()); } else doRecord = false; + if (!bigFonts && g_settings.bigFonts) { + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR)); + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR)); + } + bigFonts = g_settings.bigFonts; show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false); + showPos=0; } else if (g_settings.recording_choose_direct_rec_dir == 1) { @@ -769,7 +775,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start { hide(); recDirs.exec(NULL,""); + if (!bigFonts && g_settings.bigFonts) { + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getSize() * BIG_FONT_FAKTOR)); + g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() * BIG_FONT_FAKTOR)); + } + bigFonts = g_settings.bigFonts; show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false); + showPos=0; timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } else { @@ -851,6 +863,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start } bigFonts = g_settings.bigFonts; show(channel_id,tmp_eID,&tmp_sZeit,false); + showPos=0; } break; }