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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-13 10:02:31 +02:00
parent f50172b2fb 93bdb67b0c
commit 5bc6b7c1a1
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/eventlist.cpp
View File

@@ -300,7 +300,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
// init right info_zone
if ((g_settings.eventlist_additional) && (cc_infozone == NULL))
cc_infozone = new CComponentsText(x+width+10, y+theight, infozone_width-20, listmaxshow*fheight);
cc_infozone = new CComponentsText(x+width+OFFSET_INNER_MID, y+theight, infozone_width-2*OFFSET_INNER_MID, listmaxshow*fheight);
int res = menu_return::RETURN_REPAINT;
//printf("CEventList::exec: channel_id %llx\n", channel_id);