From 5dd769e524b3c536549e792dcbc426aad446957f Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 2 Aug 2016 12:03:42 +0200
Subject: [PATCH 1/2] epgview: completion of
 9786102aa819700006d888449e9f4dac2e563f54

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/6e3ef2375b061e24725208f5e6f549b900e0226a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: completion of 9786102aa819700006d888449e9f4dac2e563f54

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

------------------
This commit was generated by Migit
---
 src/gui/epgview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index a08645528..934fc9b07 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -194,7 +194,7 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove
 
 			// check the wordwidth - add to this line if size ok
 			int aktWordWidth = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getRenderWidth(aktWord);
-			if ((aktWordWidth+aktWidth)<(ox - 20 - 15 - (has_cover? (std::min((sb-10)*342/513,342)) :0)))
+			if ((aktWordWidth+aktWidth)<(ox - 20 - 15 - (has_cover? ((ox/4)+10) :0)))
 			{//space ok, add
 				aktWidth += aktWordWidth;
 				aktLine += aktWord;

From e93066ed229cb19144a34f98c663749aa7e253a6 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 2 Aug 2016 12:48:18 +0200
Subject: [PATCH 2/2] epgview: rename bool 'tmdbtoggle' to 'tmdb_active'

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/7df061947e4eeddf6f4f57b3d4c42364b1173407
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview: rename bool 'tmdbtoggle' to 'tmdb_active'

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

------------------
This commit was generated by Migit
---
 src/gui/epgview.cpp | 18 +++++++++---------
 src/gui/epgview.h   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 934fc9b07..c0bbd2dd3 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -122,7 +122,7 @@ CEpgData::CEpgData()
 {
 	bigFonts = false;
 	frameBuffer = CFrameBuffer::getInstance();
-	tmdbtoggle = false;
+	tmdb_active = false;
 	header     = NULL;
 }
 
@@ -274,7 +274,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
 		}
 	}
 	int logo_offset = 0;
-	if (tmdbtoggle && startPos == 0) {
+	if (tmdb_active && startPos == 0) {
 		int icon_w,icon_h;
 		frameBuffer->getIconSize(NEUTRINO_ICON_TMDB, &icon_w, &icon_h);
 		frameBuffer->paintIcon(NEUTRINO_ICON_TMDB, sx+10+cover_offset, ypos+10);
@@ -544,7 +544,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 		startzeit=*a_startzeit;
 	id=a_id;
 
-	tmdbtoggle = false;
+	tmdb_active = false;
 	stars = 0;
 
 	int height = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight();
@@ -868,7 +868,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 				if (showPos+scrollCount<textCount)
 				{
 					showPos += scrollCount;
-					showText(showPos, sy + toph, tmdbtoggle, false);
+					showText(showPos, sy + toph, tmdb_active, false);
 				}
 				break;
 			case CRCInput::RC_up:
@@ -876,7 +876,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 					showPos -= scrollCount;
 					if (showPos < 0)
 						showPos = 0;
-					showText(showPos, sy + toph, tmdbtoggle, false);
+					showText(showPos, sy + toph, tmdb_active, false);
 				}
 				break;
 			case CRCInput::RC_page_up:
@@ -1016,12 +1016,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 				if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 				{
 					showPos = 0;
-					if (!tmdbtoggle) {
+					if (!tmdb_active) {
 						cTmdb* tmdb = new cTmdb(epgData.title);
 						if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty())) {
 							epgText_saved = epgText;
 							epgText.clear();
-							tmdbtoggle = !tmdbtoggle;
+							tmdb_active = !tmdb_active;
 
 							epgTextSwitch = tmdb->getDescription();
 							if (!tmdb->getCast().empty())
@@ -1030,7 +1030,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 							processTextToArray(tmdb->CreateEPGText(), 0, tmdb->hasCover());
 							textCount = epgText.size();
 							stars = tmdb->getStars();
-							showText(showPos, sy + toph, tmdbtoggle);
+							showText(showPos, sy + toph, tmdb_active);
 						} else {
 							ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMessageBox::mbrOk , CMessageBox::mbrOk);
 						}
@@ -1038,7 +1038,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 					} else {
 						epgText = epgText_saved;
 						textCount = epgText.size();
-						tmdbtoggle = !tmdbtoggle;
+						tmdb_active = !tmdb_active;
 						stars=0;
 						showText(showPos, sy + toph);
 					}
diff --git a/src/gui/epgview.h b/src/gui/epgview.h
index bfed0261c..1b23af3f3 100644
--- a/src/gui/epgview.h
+++ b/src/gui/epgview.h
@@ -65,8 +65,8 @@ class CEpgData
 		bool			bigFonts;
 		bool 			has_follow_screenings;
 		bool 			call_fromfollowlist;
-		bool			tmdbtoggle;
-		int				stars;
+		bool			tmdb_active;
+		int			stars;
 		time_t			tmp_curent_zeit;
 
 		uint64_t		prev_id;