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

patch for width logos

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@576 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-05-09 18:45:58 +00:00
parent d79f6177eb
commit 0dd250e707
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/epgview.cpp
View File

@@ -578,9 +578,14 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
tallchans_iterator cit = allchans.find(channel_id); tallchans_iterator cit = allchans.find(channel_id);
if(cit != allchans.end()) { if(cit != allchans.end()) {
std::string lname; std::string lname;
if(g_PicViewer->GetLogoName(channel_id, cit->second.getName(), lname)) { int logo_w = 0;
g_PicViewer->DisplayImage(lname, sx+10, sy + (toph-PIC_H)/2/*5*/, PIC_W, PIC_H); int logo_h = 0;
pic_offx = PIC_W + 10; if(g_PicViewer->GetLogoName(channel_id, cit->second.getName(), lname, &logo_w, &logo_h)) {
if(logo_h > PIC_H)
logo_h = PIC_H;
g_PicViewer->DisplayImage(lname, sx+10, sy + (toph-logo_h)/2/*5*/, logo_w, logo_h);
pic_offx = logo_w + 10;
} }
} }

12
src/gui/eventlist.cpp
View File

@@ -692,12 +692,16 @@ void EventList::paintHead(t_channel_id channel_id, std::string channelname)
frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP); frameBuffer->paintBoxRel(x,y, width,theight+0, COL_MENUHEAD_PLUS_0, RADIUS_LARGE, CORNER_TOP);
std::string lname; std::string lname;
if(g_PicViewer->GetLogoName(channel_id, channelname, lname)) int logo_w = 0;
logo_ok = g_PicViewer->DisplayImage(lname, x+10, y+(theight-PIC_H)/2, PIC_W, PIC_H); int logo_h = 0;
if(g_PicViewer->GetLogoName(channel_id, channelname, lname, &logo_w, &logo_h)){
if(logo_h > PIC_H)
logo_h = PIC_H;
logo_ok = g_PicViewer->DisplayImage(lname, x+10, y+(theight-logo_h)/2, logo_w, logo_h);
}
//logo_ok = g_PicViewer->DisplayLogo(channel_id, x+10, y+(theight-PIC_H)/2, PIC_W, PIC_H); //logo_ok = g_PicViewer->DisplayLogo(channel_id, x+10, y+(theight-PIC_H)/2, PIC_W, PIC_H);
g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->RenderString(x+15+(logo_ok? 5+PIC_W:0),y+theight+1, width, name.c_str(), COL_MENUHEAD, 0, true); // UTF-8 g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->RenderString(x+15+(logo_ok? 5+logo_w:0),y+theight+1, width, name.c_str(), COL_MENUHEAD, 0, true); // UTF-8
} }
void EventList::paint(t_channel_id channel_id) void EventList::paint(t_channel_id channel_id)