Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ae57d1567
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-02 (Tue, 02 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-05-02 22:35:18 +02:00
6 changed files with 21 additions and 9 deletions

View File

@@ -144,6 +144,8 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
cch_cl_sec_format = cch_cl_format;
cch_cl_enable_run = false;
cch_text_max_w = width;
addContextButton(buttons);
initCCItems();
initParent(parent);
@@ -562,6 +564,7 @@ void CComponentsHeader::initCaption()
cch_cl_obj->allowPaint(cch_cl_enable);
}
cc_text_w = min(cc_text_w,cch_text_max_w);
//create cch_text_obj and add to collection
if (cch_text_obj == NULL){