From 55a9b0db75e87679d101a6150bcd07d3282c5e88 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 7 Aug 2012 19:40:39 +0200 Subject: [PATCH] Bedit: apply last CComponent changes --- src/gui/bedit/bouqueteditor_channels.cpp | 8 ++++---- src/gui/bedit/bouqueteditor_chanselect.cpp | 14 ++++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 125704af5..8442a04b0 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -228,10 +228,10 @@ void CBEChannelWidget::paintItem2DetailsLine (int pos, int /*ch_index*/) void CBEChannelWidget::clearItem2DetailsLine() { - if (dline != NULL) - dline->paintBackground(); //kill details line - if (ibox != NULL) - ibox->paintBackground(); //kill info box + if (dline) + dline->kill(); //kill details line + if (ibox) + ibox->kill(); //kill info box } void CBEChannelWidget::hide() diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 1ba48f5dd..b464f1258 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -78,13 +78,7 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsi CBEChannelSelectWidget::~CBEChannelSelectWidget() { - // clear details line - if (dline != NULL) - dline->paintBackground(); delete dline; - // clear infobox - if (ibox != NULL) - ibox->paintBackground(); delete ibox; } @@ -236,11 +230,11 @@ void CBEChannelSelectWidget::paintItem2DetailsLine (int pos, int /*ch_index*/) int ypos2a = ypos2 + (info_height/2)-2; // clear details line - if (dline != NULL) - dline->paintBackground(); + if (dline) + dline->hide(); // clear infobox - if (ibox != NULL) + if (ibox) ibox->hide(); // paint Line if detail info (and not valid list pos) @@ -249,7 +243,7 @@ void CBEChannelSelectWidget::paintItem2DetailsLine (int pos, int /*ch_index*/) if (dline == NULL) dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, fheight/2+1, info_height-RADIUS_LARGE*2); dline->setYPos(ypos1a); - dline->paint(false); + dline->paint(true); //infobox if (ibox == NULL)