Merge branch 'master' into pu/fb-modules

This commit is contained in:
M. Liebmann
2017-02-12 09:24:08 +01:00
32 changed files with 112 additions and 99 deletions

View File

@@ -222,7 +222,7 @@ void CComponentsPicture::initCCItem()
{
float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (do_scale && (width > 10 || height > 10))
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif