Merge remote-tracking branch 'uncool/cst-next'

This need buildfixes and some functional updates...
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
320 changed files with 21291 additions and 13199 deletions

View File

@@ -98,8 +98,9 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
col_body = color_body;
col_shadow = color_shadow;
col_body = COL_MENUHEAD_PLUS_0;
col_body_gradient = g_settings.gradiant;
cc_body_gradient_direction = CFrameBuffer::gradientVertical;
col_body_gradient = g_settings.theme.menu_Head_gradient;
cc_body_gradient_direction = CFrameBuffer::gradientVertical;
cc_body_gradient_mode = CColorGradient::gradientLight2Dark;
cch_text = caption;
cch_icon_name = icon_name;
@@ -205,7 +206,7 @@ void CComponentsHeader::initIcon()
//get dimensions of header icon
int iw = 0;
int ih = 0;
cch_icon_obj->getImageSize(&iw, &ih);
cch_icon_obj->getSize(&iw, &ih);
dprintf(DEBUG_INFO, "[CComponentsHeader]\n [%s - %d] init icon size: iw = %d, ih = %d\n", __func__, __LINE__, iw, ih);
cch_icon_obj->setWidth(iw);
cch_icon_obj->setHeight(ih);