RowItem: Split appart visual and layout v offsets

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 2ab8ed986568ba4bfeaa36043840b723541ce867..2264bc2c945f96b41ea88d387af4c5221d3a8cb9 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -101,7 +101,7 @@ void Header::show_popup(const shared_ptr<RowItem> &item)
        if (!p)
                return;
 
-       const QPoint pt(width() - BaselineOffset, item->get_y());
+       const QPoint pt(width() - BaselineOffset, item->get_visual_y());
        p->set_position(mapToGlobal(pt), Popup::Right);
        p->show();
 }
@@ -118,7 +118,7 @@ void Header::paintEvent(QPaintEvent*)
 
        stable_sort(row_items.begin(), row_items.end(),
                [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-                       return a->v_offset() < b->v_offset(); });
+                       return a->visual_v_offset() < b->visual_v_offset(); });
 
        QPainter painter(this);
        painter.setRenderHint(QPainter::Antialiasing);
@@ -190,9 +190,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
        for (auto &r : _view)
                r->drag_release();
 
-       if (_dragging)
-               _view.normalize_layout();
-       else
+       if (!_dragging)
        {
                if (!ctrl_pressed) {
                        for (shared_ptr<RowItem> r : _view)
@@ -248,7 +246,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
        for (std::shared_ptr<RowItem> r : _view)
                if (r->dragging()) {
-                       r->set_v_offset(r->drag_point().y() + delta);
+                       r->force_to_v_offset(r->drag_point().y() + delta);
 
                        // Ensure the trace is selected
                        r->select();