mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsPicture: move resize to end of methode

Browse Source
This commit is contained in:
Thilo Graf
2016-02-08 21:14:41 +01:00
parent 1e646734f3
commit 96f9eaf287
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,8 @@ void CComponentsPicture::setPicture(const std::string& picture_name)
{ {
if (pic_name == picture_name) if (pic_name == picture_name)
return; return;
width = dx = dxc = 0;
height = dy = dyc = 0;
need_init = true; need_init = true;
clearCache(); clearCache();
pic_name = picture_name; pic_name = picture_name;
@@ -209,17 +211,10 @@ void CComponentsPicture::initCCItem()
if (width == dx && height == dy) if (width == dx && height == dy)
return; return;
/* finally handle scale behavior /* finally handle scale behavior
* This evaluates the parameters given * This evaluates the parameters given
* by setters setWidth/setHeight * by setters setWidth/setHeight
*/ * these steps are required to assign the current image dimensions to item dimensions
//resize image and apply current assigned scale values
int w_2scale = width;
int h_2scale = height;
g_PicViewer->rescaleImageDimensions(&width, &height, w_2scale, h_2scale);
/* these steps are required to assign the current image dimensions to item dimensions
*/ */
if (keep_dx_aspect){ if (keep_dx_aspect){
float h_ratio = float(height)*100/(float)dy; float h_ratio = float(height)*100/(float)dy;
@@ -233,6 +228,11 @@ void CComponentsPicture::initCCItem()
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);
} }
//resize image and apply current assigned scale values
int w_2scale = width;
int h_2scale = height;
g_PicViewer->rescaleImageDimensions(&width, &height, w_2scale, h_2scale);
} }
void CComponentsPicture::initPosition(int *x_position, int *y_position) void CComponentsPicture::initPosition(int *x_position, int *y_position)