Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Conflicts:
	src/driver/simple_display.cpp


Origin commit data
------------------
Commit: db0efcca40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
This commit is contained in:
vanhofen
2017-11-03 22:40:43 +01:00
3 changed files with 4 additions and 4 deletions

View File

@@ -207,7 +207,7 @@ void CComponentsItem::paintInit(bool do_save_bg)
//handle frame color for slected/not selected item
if (fr_thickness) {
for(size_t j =0; j< v_fbdata.size() ;j++) {
if ((v_fbdata[j].fbdata_type == CC_FBDATA_TYPE_FRAME)){
if (v_fbdata[j].fbdata_type == CC_FBDATA_TYPE_FRAME){
v_fbdata[j].color = col_frame_cur;
v_fbdata[j].frame_thickness = th;
}