Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-06-16 14:19:26 +02:00
21 changed files with 207 additions and 180 deletions

View File

@@ -258,7 +258,7 @@ void CComponentsHeader::initIcon()
//set corner mode of icon item
int cc_icon_corner_type = CORNER_LEFT;
if (corner_type == CORNER_TOP_LEFT || corner_type == CORNER_TOP)
if (corner_type & CORNER_TOP_LEFT || corner_type & CORNER_TOP)
cc_icon_corner_type = CORNER_TOP_LEFT;
cch_icon_obj->setCorner(corner_rad-fr_thickness, cc_icon_corner_type);