Revert "Make traces non-draggable outside the header area"

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 2e15ca958a1da81af2ebba507328da0b9cb801b6..f7bba9ff31506e5a5fa68abaacfe1fe3163e321e 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -41,8 +41,12 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
+const QColor Trace::DarkBGColour(235, 235, 235);    // Quite light grey
+const QColor Trace::BrightBGColour(245, 245, 245);  // Very light grey
+
 Trace::Trace(QString name) :
        name_(name),
+       coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
        popup_(nullptr),
        popup_form_(nullptr)
 {
@@ -66,6 +70,14 @@ QColor Trace::colour() const
 void Trace::set_colour(QColor colour)
 {
        colour_ = colour;
+
+       bgcolour_ = colour;
+       bgcolour_.setAlpha(20);
+}
+
+void Trace::set_coloured_bg(bool state)
+{
+       coloured_bg_ = state;
 }
 
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -170,6 +182,25 @@ QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
                pp.width(), h);
 }
 
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
+       if (coloured_bg_)
+               p.setBrush(bgcolour_);
+       else
+               p.setBrush(bgcolour_state_ ? BrightBGColour : DarkBGColour);
+
+       p.setPen(QPen(Qt::NoPen));
+
+       const std::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);
+}
+
 void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
        p.setPen(AxisPen);
@@ -236,7 +267,7 @@ void Trace::on_colour_changed(const QColor &colour)
        set_colour(colour);
 
        if (owner_)
-               owner_->row_item_appearance_changed(true, false);
+               owner_->row_item_appearance_changed(true, true);
 }
 
 } // namespace view