RowItem: Split appart visual and layout v offsets

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 8963e047b355dc8f3f0d2d2eba30fd2cb3b92766..c85f915a591eba05e36791f870509da3b943eebe 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -56,14 +56,6 @@ Viewport::Viewport(View &parent) :
                this, SLOT(on_signals_moved()));
 }
 
-int Viewport::get_total_height() const
-{
-       int h = 0;
-       for (auto &i : _view)
-               h = max(i->v_offset() + View::SignalHeight, h);
-       return h;
-}
-
 void Viewport::signals_updated()
 {
        for (shared_ptr<RowItem> r : _view) {
@@ -78,7 +70,7 @@ void Viewport::paintEvent(QPaintEvent*)
        vector< shared_ptr<RowItem> > row_items(_view.begin(), _view.end());
        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 p(this);
        p.setRenderHint(QPainter::Antialiasing);