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

CComponentsPicture: fix and simplify image scale handling

Browse Source 
Aspect ratio was not considered in some constallations, To see on button
icons and oversized custom channellogos in channllist.
Now this is handeled on init of image object and setters for width and height.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 53a350d5af
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-07-11 (Sat, 11 Jul 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-07-11 22:00:33 +02:00
parent dad841f5c6
commit 620e25d442
2 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/components/cc_item_picture.h
View File

@@ -49,6 +49,9 @@ class CComponentsPicture : public CComponentsItem
///possible image formats
std::vector<std::string> v_ext;
///current original image dimensions
int dx, dy;
///property: name of image (without extensionn) full path to image (with extension), icon names to find in /widget/icons.h, icons will paint never scaled
std::string pic_name;
@@ -63,6 +66,9 @@ class CComponentsPicture : public CComponentsItem
///set internel paint mode to allow/disallow scale an image, value is assigned with constructor, if defined dimensions w and h = 0, then image scale is enabled
bool do_scale;
///sets internal option for keeping aspect, see also setHeight(), setWidth(), default value = false
bool keep_dx_aspect;
bool keep_dy_aspect;
void init( const int &x_pos, const int &y_pos, const int &w, const int &h,
const std::string& image_name,
@@ -132,10 +138,10 @@ class CComponentsPicture : public CComponentsItem
///return height of component
virtual int getHeight();
///set width of object and image, value >0 causes scale of image
virtual void setWidth(const int& w){CComponentsItem::setWidth(w), do_scale = true; initCCItem();}
///set height of object and image, value >0 causes scale of image
virtual void setHeight(const int& h){CComponentsItem::setHeight(h), do_scale = true; initCCItem();}
///set width of object and image, value >0 causes scale of image, parameter keep_aspect = true causes scaling of height with same aspect, default = false
virtual void setWidth(const int& w, bool keep_aspect = false);
///set height of object and image, value >0 causes scale of image, parameter keep_aspect = true causes scaling of width with same aspect, , default = false
virtual void setHeight(const int& h, bool keep_aspect = false);
///set width of object and image related to current screen size, see also CComponentsItem::setWidthP(), parameter as uint8_t
virtual void setWidthP(const uint8_t& w_percent){CComponentsItem::setWidthP(w_percent), do_scale = true; initCCItem();}
///set height of object and image related to current screen size, see also CComponentsItem::setHeightP(), parameter as uint8_t