X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=2154f8a7af1354216dce1b2874bc42e6064135c9;hb=5ed05b699e5367bae21828f533e3d169b9bab348;hp=2a1eb959634fb23289cc1b12fa8c5613ef795e81;hpb=489953884c0d7692fa20748314751e114ae54cf2;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 2a1eb95..2154f8a 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -59,6 +59,11 @@ Trace::Trace(shared_ptr<data::SignalBase> channel) :
 		this, SLOT(on_colour_changed(const QColor&)));
 }
 
+shared_ptr<data::SignalBase> Trace::base() const
+{
+	return base_;
+}
+
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	const int y = get_visual_y();
@@ -151,7 +156,7 @@ QRectF Trace::label_rect(const QRectF &rect) const
 		label_size.height());
 }
 
-void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+void Trace::paint_back(QPainter &p, ViewItemPaintParams &pp)
 {
 	const View *view = owner_->view();
 	assert(view);
@@ -159,21 +164,16 @@ void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 	if (view->coloured_bg())
 		p.setBrush(base_->bgcolour());
 	else
-		p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
+		p.setBrush(pp.next_bg_colour_state() ? BrightGrayBGColour : DarkGrayBGColour);
 
 	p.setPen(QPen(Qt::NoPen));
 
 	const pair<int, int> extents = v_extents();
-
-	const int x = 0;
-	const int y = get_visual_y() + extents.first;
-	const int w = pp.right() - pp.left();
-	const int h = extents.second - extents.first;
-
-	p.drawRect(x, y, w, h);
+	p.drawRect(pp.left(), get_visual_y() + extents.first,
+		pp.width(), extents.second - extents.first);
 }
 
-void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
+void Trace::paint_axis(QPainter &p, ViewItemPaintParams &pp, int y)
 {
 	p.setRenderHint(QPainter::Antialiasing, false);