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

- cc_item_picture: reset keep_aspect variables after use

Browse Source
This commit is contained in:
svenhoefer
2016-11-12 22:00:12 +01:00
parent da604fb9a5
commit 73b97ecd4d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,17 +216,21 @@ void CComponentsPicture::initCCItem()
* by setters setWidth/setHeight * by setters setWidth/setHeight
* these steps are required to assign the current image dimensions to item dimensions * these steps are required to assign the current image dimensions to item dimensions
*/ */
if (keep_dx_aspect && dy){ if (keep_dx_aspect && dy)
{
float h_ratio = float(height)*100/(float)dy; float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100); width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_APOLLO
if (do_scale && (width > 10 || height > 10)) if (do_scale && (width > 10 || height > 10))
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif #endif
keep_dx_aspect = false;
} }
if (keep_dy_aspect && dx){ if (keep_dy_aspect && dx)
{
float w_ratio = float(width)*100/(float)dx; float w_ratio = float(width)*100/(float)dx;
height = int(w_ratio*(float)dy/100); height = int(w_ratio*(float)dy/100);
keep_dy_aspect = false;
} }
//resize image and apply current assigned scale values //resize image and apply current assigned scale values