mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-05-02 22:35:18 +02:00
parent 74c0b58e71 c482dd139f
commit 4ae57d1567
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/components/cc_frm_header.cpp
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){