Corrected label layout when text is empty

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 64ecf83a6079ba4362496077299f26f3f0581233..b52d689f22c12d988ef3d2f56499bc0b3e9f4629 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -75,8 +75,8 @@ View::View(SigSession &session, QWidget *parent) :
                Cursor(*this, 1.0))),
        _hover_point(-1, -1)
 {
-       connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
-               this, SLOT(h_scroll_value_changed(int)));
+       connect(horizontalScrollBar(), SIGNAL(sliderMoved(int)),
+               this, SLOT(h_scroll_moved(int)));
        connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(v_scroll_value_changed(int)));
 
@@ -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());
@@ -288,7 +288,7 @@ void View::resizeEvent(QResizeEvent *e)
        update_scroll();
 }
 
-void View::h_scroll_value_changed(int value)
+void View::h_scroll_moved(int value)
 {
        const int range = horizontalScrollBar()->maximum();
        if (range < MaxScrollValue)