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

CComponentsPicture: fix missing dimension values on wrong image location

Browse Source 
In some constellations we can't get dimensions from getIconSize(),
so it is useful to fall back to g_PicViewer->getSize().

Cache cleanup removed, can be done at runtime if required.
This commit is contained in:
Thilo Graf
2016-01-19 11:16:43 +01:00
committed by M. Liebmann
parent 96d7401e08
commit 0c67739074
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/components/cc_item_picture.cpp
View File

@@ -152,6 +152,18 @@ void CComponentsPicture::initCCItem()
if (!do_scale){
//use image/icon size as object dimension values
frameBuffer->getIconSize(pic_name.c_str(), &width, &height);
/*if we have an image with full path => fallback to pv methode.
* That's always a cramp, why we don't have an unified solution in render classes?
*/
if (width == 0 || height == 0){
int dx_tmp, dy_tmp;
g_PicViewer->getSize(pic_name.c_str(), &dx_tmp, &dy_tmp);
if (width == 0)
width = dx_tmp;
if (height == 0)
height = dy_tmp;
}
return;
}
else{ //initialized scaled size
@@ -169,10 +181,10 @@ void CComponentsPicture::initCCItem()
//check dimensions, leave if dimensions are equal
if (width == dx && height == dy)
return;
#if 0
//clean up possible cache on changed dimensions
clearCache();
#endif
//temporarily vars
int w_2scale = width;
int h_2scale = height;
@@ -294,7 +306,6 @@ bool CComponentsPicture::hasChanges()
return ret;
}
CComponentsChannelLogo::CComponentsChannelLogo( const int &x_pos, const int &y_pos, const int &w, const int &h,
const std::string& channelName,
const uint64_t& channelId,