From 0b245e051c24abd8f01fda461cf75b21a0ce1c9c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 12 Nov 2016 22:00:12 +0100 Subject: [PATCH] cc_item_picture: reset keep_aspect variables after use Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/73b97ecd4df690d8283ea706fe4ca4bbc48a0d1f Author: vanhofen Date: 2016-11-12 (Sat, 12 Nov 2016) Origin message was: ------------------ - cc_item_picture: reset keep_aspect variables after use ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_item_picture.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_picture.cpp b/src/gui/components/cc_item_picture.cpp index 89ffaed86..ad3ec018b 100644 --- a/src/gui/components/cc_item_picture.cpp +++ b/src/gui/components/cc_item_picture.cpp @@ -216,17 +216,21 @@ void CComponentsPicture::initCCItem() * by setters setWidth/setHeight * 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; width = int(h_ratio*(float)dx/100); #ifdef BOXMODEL_APOLLO if (do_scale && (width > 10 || height > 10)) width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; #endif + keep_dx_aspect = false; } - if (keep_dy_aspect && dx){ + if (keep_dy_aspect && dx) + { float w_ratio = float(width)*100/(float)dx; height = int(w_ratio*(float)dy/100); + keep_dy_aspect = false; } //resize image and apply current assigned scale values