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

Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 16fbaaa096
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-12 12:13:43 +02:00
8 changed files with 32 additions and 26 deletions

View File

@@ -1667,13 +1667,13 @@ void CChannelList::paintItem2DetailsLine (int pos)
return;
int xpos = x - ConnectLineBox_Width;
int ypos1 = y + theight + pos*fheight + (fheight/2)-2;
int ypos2 = y + height + (info_height/2)-2;
int ypos1 = y + theight + pos*fheight + (fheight/2);
int ypos2 = y + height + (info_height/2);
// paint Line if detail info (and not valid list pos)
if (pos >= 0) {
if (dline == NULL)
dline = new CComponentsDetailLine(xpos, ypos1, ypos2, fheight/2+1, info_height-RADIUS_LARGE*2);
dline = new CComponentsDetailLine(xpos, ypos1, ypos2, fheight/2, info_height-RADIUS_LARGE*2);
dline->paint(false);
}
}