mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d1316417a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-17 (Wed, 17 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-17 21:38:03 +02:00
parent d859151274 59d3c49084
commit c743021398
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,7 +395,7 @@ void CComponentsHeader::initClock()
//set clock form properties
if (cch_cl_obj){
cch_cl_obj->setYPos(cch_items_y);
cch_cl_obj->setHeight(height);
cch_cl_obj->setHeight(height - 1); //NI
//disallow paint of clock, if disabled and exit method
if (!cch_cl_enable){