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

neutrino channellist: fix text termination on painted rec-icon

Browse Source 
patch by micha-bbg
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p134532-anzeige-f%C3%BCr-laufende-aufnahmen/#post134532

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1738 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b48b60bb5
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-10-02 (Sun, 02 Oct 2011)

Origin message was:
------------------
*neutrino channellist: fix text termination on painted rec-icon

patch by micha-bbg
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p134532-anzeige-f%C3%BCr-laufende-aufnahmen/#post134532

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1738 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2011-10-02 13:02:50 +00:00
parent e458f93acb
commit d5ab085ed5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/channellist.cpp
View File

@@ -1872,13 +1872,12 @@ void CChannelList::paintItem(int pos)
rec_icon = NEUTRINO_ICON_REC; rec_icon = NEUTRINO_ICON_REC;
else if (rec_mode == CRecordManager::RECMODE_TSHIFT) else if (rec_mode == CRecordManager::RECMODE_TSHIFT)
rec_icon = NEUTRINO_ICON_AUTO_SHIFT; rec_icon = NEUTRINO_ICON_AUTO_SHIFT;
else if (rec_mode == CRecordManager::RECMODE_REC_TSHIFT)
rec_icon = NEUTRINO_ICON_AUTO_SHIFT_GRAY;
//calculating icons //calculating icons
int icon_x = (x+width-15-2) - RADIUS_LARGE/2; int icon_x = (x+width-15-2) - RADIUS_LARGE/2;
int r_icon_h=0; int r_icon_w=0; int s_icon_h=0; int s_icon_w=0; int r_icon_h=0; int r_icon_w=0; int s_icon_h=0; int s_icon_w=0;
frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED, &s_icon_w, &s_icon_h); frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED, &s_icon_w, &s_icon_h);
if (rec_mode != CRecordManager::RECMODE_OFF)
frameBuffer->getIconSize(rec_icon, &r_icon_w, &r_icon_h); frameBuffer->getIconSize(rec_icon, &r_icon_w, &r_icon_h);
int r_icon_x = icon_x; int r_icon_x = icon_x;
@@ -1890,7 +1889,7 @@ void CChannelList::paintItem(int pos)
//paint recording icon //paint recording icon
//bool do_rec = CRecordManager::getInstance()->RecordingStatus(chanlist[curr]->channel_id); //bool do_rec = CRecordManager::getInstance()->RecordingStatus(chanlist[curr]->channel_id);
if (rec_mode != CRecordManager::RECMODE_OFF) if (rec_mode != CRecordManager::RECMODE_OFF)
frameBuffer->paintIcon(rec_icon, r_icon_x - r_icon_w, ypos, fheight);//ypos + (fheight - 16)/2); frameBuffer->paintIcon(rec_icon, r_icon_x - r_icon_w - 4, ypos, fheight);//ypos + (fheight - 16)/2);
//paint buttons //paint buttons
paintButtonBar(iscurrent); paintButtonBar(iscurrent);
@@ -1964,7 +1963,7 @@ void CChannelList::paintItem(int pos)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 5+ numwidth+ 10+prg_offset, ypos+ fheight, width- numwidth- 40- 15-prg_offset, nameAndDescription, color, 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 5+ numwidth+ 10+prg_offset, ypos+ fheight, width- numwidth- 40- 15-prg_offset, nameAndDescription, color, 0, true);
if (g_settings.channellist_epgtext_align_right) { if (g_settings.channellist_epgtext_align_right) {
// align right // align right
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x + width - 20 - ch_desc_len - 28, ypos + fheight, ch_desc_len, p_event->description, (curr == selected)?COL_MENUCONTENTSELECTED:(!displayNext ? COL_MENUCONTENT : COL_MENUCONTENTINACTIVE) , 0, true); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x + width - 20 - ch_desc_len - icon_space - 4, ypos + fheight, ch_desc_len, p_event->description, (curr == selected)?COL_MENUCONTENTSELECTED:(!displayNext ? COL_MENUCONTENT : COL_MENUCONTENTINACTIVE) , 0, true);
} }
else { else {
// align left // align left