CChannelList: devel_cc fix merge errors

var full_width was lost during merge, this fixes
header and details width
This commit is contained in:
2013-02-17 00:42:18 +01:00
parent 6175fd989d
commit ec0a91813a

View File

@@ -1668,7 +1668,7 @@ void CChannelList::paintItem2DetailsLine (int pos)
if (ibox == NULL) if (ibox == NULL)
ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height); ibox = new CComponentsInfoBox(x, y + height + 2, width, info_height);
if (ibox){ if (ibox){
ibox->setDimensionsAll(x, ypos2, width, info_height); ibox->setDimensionsAll(x, ypos2, full_width, info_height);
ibox->setFrameThickness(2); ibox->setFrameThickness(2);
ibox->setCornerRadius(RADIUS_LARGE); ibox->setCornerRadius(RADIUS_LARGE);
ibox->setShadowOnOff(CC_SHADOW_OFF); ibox->setShadowOnOff(CC_SHADOW_OFF);
@@ -1996,7 +1996,7 @@ void CChannelList::paintHead()
{ {
if (clHead == NULL) { if (clHead == NULL) {
clHead = new CComponentsTitleBar(); clHead = new CComponentsTitleBar();
clHead->setDimensionsAll(x, y, width, theight); clHead->setDimensionsAll(x, y, full_width, theight);
clHead->addText(name); clHead->addText(name);