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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
svenhoefer
2017-04-19 21:35:56 +02:00
parent b1c54c5e88 a3bf23d9c9
commit 11a28c07d6
26 changed files with 217 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/components/cc_frm_header.cpp
View File

@@ -413,7 +413,6 @@ void CComponentsHeader::initClock()
//set clock form properties
if (cch_cl_obj){
cch_cl_obj->setYPos(cch_items_y);
cch_cl_obj->setHeight(height);
//disallow paint of clock, if disabled and exit method
@@ -475,7 +474,7 @@ void CComponentsHeader::initCaption()
int clock_w = cch_cl_enable ? cch_cl_obj->getWidth() : 0;
//set x position of clock
cch_cl_obj->setXPos(width - buttons_w - clock_w - cch_offset);
cch_cl_obj->setXPos(width - buttons_w - clock_w);
//set required width of caption object
cc_text_w -= (clock_w + cch_offset);