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

streaminfo: don't paint outside of the framebuffer

Browse Source 
Origin commit data
------------------
Commit: 0bc265c496
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)
This commit is contained in:
Stefan Seyfried
2015-02-21 18:21:13 +01:00
parent 159aa1aa17
commit e5b81d4631
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/streaminfo2.cpp
View File

@@ -700,12 +700,10 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
#define NUM_CAIDS 11 #define NUM_CAIDS 11
void CStreamInfo2::paintCASystem(int xpos, int ypos) void CStreamInfo2::paintCASystem(int xpos, int ypos)
{ {
unsigned short i, ypos1 = 0; unsigned short i;
int box_width = width*2/3-10; int box_width = width*2/3-10;
if(box_h2 > 0) if (box_h2 > 0)
{ frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUHEAD_PLUS_0);
frameBuffer->paintBoxRel (0, ypos+(iheight*2), box_width, box_h2, COL_MENUHEAD_PLUS_0);
}
std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
bool caids[NUM_CAIDS]; bool caids[NUM_CAIDS];
@@ -782,6 +780,10 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
cryptsysteme = false; cryptsysteme = false;
} }
ypos += sheight; ypos += sheight;
if (ypos > max_height) {
ypos -= sheight;
break;
}
int width_txt = 0, index = 0; int width_txt = 0, index = 0;
const char *tok = " "; const char *tok = " ";
std::string::size_type last_pos = casys[ca_id].find_first_not_of(tok, 0); std::string::size_type last_pos = casys[ca_id].find_first_not_of(tok, 0);
@@ -800,8 +802,8 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
} }
} }
} }
if(box_h2 == 0) if (box_h2 < ypos)
box_h2 = ypos - ypos1; box_h2 = ypos;
} }
/* /*