Revert "View: Decouple horizontal scrolling from the scoll bar"

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 64ecf83a6079ba4362496077299f26f3f0581233..34676334dc67867ba9b17fa064498232693e74e0 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -228,7 +228,7 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-       int offset = SignalMargin;
+       int offset = SignalMargin + SignalHeight;
        const vector< shared_ptr<Signal> > sigs(_session.get_signals());
        BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
                s->set_v_offset(offset);
@@ -279,7 +279,7 @@ bool View::viewportEvent(QEvent *e)
        }
 }
 
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
 {
        _ruler->setGeometry(_viewport->x(), 0,
                _viewport->width(), _viewport->y());