RowItemOwner: Replaced parent notification scheme

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index f754868c96b69b4efd0bc61856fa71d946aa3071..d8925c1aaa2acc1f2d3f0b4bc5a39bf3d420d3c0 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -67,10 +67,6 @@ const double View::MinScale = 1e-15;
 
 const int View::MaxScrollValue = INT_MAX / 2;
 
-const int View::SignalHeight = 30;
-const int View::SignalMargin = 10;
-const int View::SignalSnapGridSize = 10;
-
 const QColor View::CursorAreaColour(220, 231, 243);
 
 const QSizeF View::LabelPadding(4, 0);
@@ -109,8 +105,6 @@ View::View(SigSession &session, QWidget *parent) :
        connect(_cursors.second().get(), SIGNAL(time_changed()),
                this, SLOT(marker_time_changed()));
 
-       connect(_header, SIGNAL(geometry_updated()),
-               this, SLOT(on_geometry_updated()));
        connect(_header, SIGNAL(signals_moved()),
                this, SLOT(on_signals_moved()));
 
@@ -127,6 +121,10 @@ View::View(SigSession &session, QWidget *parent) :
        connect(this, SIGNAL(hover_point_changed()),
                this, SLOT(on_hover_point_changed()));
 
+       connect(&_lazy_event_handler, SIGNAL(timeout()),
+               this, SLOT(process_sticky_events()));
+       _lazy_event_handler.setSingleShot(true);
+
        setViewport(_viewport);
 
        _viewport->installEventFilter(this);
@@ -324,20 +322,6 @@ const QPoint& View::hover_point() const
        return _hover_point;
 }
 
-void View::normalize_layout()
-{
-       int v_min = INT_MAX;
-       for (const shared_ptr<RowItem> r : *this)
-               v_min = min(r->v_offset(), v_min);
-
-       const int delta = -min(v_min, 0);
-       for (shared_ptr<RowItem> r : *this)
-               r->set_v_offset(r->v_offset() + delta);
-
-       verticalScrollBar()->setSliderPosition(_v_offset + delta);
-       v_scroll_value_changed(verticalScrollBar()->sliderPosition());
-}
-
 void View::update_viewport()
 {
        assert(_viewport);
@@ -387,9 +371,11 @@ void View::update_scroll()
 
        // Set the vertical scrollbar
        verticalScrollBar()->setPageStep(areaSize.height());
-       verticalScrollBar()->setRange(0,
-               _viewport->get_total_height() + SignalMargin -
-               areaSize.height());
+
+       const pair<int, int> extents = v_extents();
+       const int extra_scroll_height = (extents.second - extents.first) / 4;
+       verticalScrollBar()->setRange(extents.first - extra_scroll_height,
+               extents.first + extra_scroll_height);
 }
 
 void View::update_layout()
@@ -470,6 +456,22 @@ void View::resizeEvent(QResizeEvent*)
        update_layout();
 }
 
+void View::appearance_changed(bool label, bool content)
+{
+       if (label)
+               _header->update();
+       if (content)
+               _viewport->update();
+}
+
+void View::extents_changed(bool horz, bool vert)
+{
+       _sticky_events |=
+               (horz ? SelectableItemHExtentsChanged : 0) |
+               (vert ? SelectableItemVExtentsChanged : 0);
+       _lazy_event_handler.start();
+}
+
 void View::h_scroll_value_changed(int value)
 {
        if (_updating_scroll)
@@ -514,18 +516,17 @@ void View::signals_changed()
 #endif
 
        // Create the initial layout
-       int offset = SignalMargin + SignalHeight;
+       int offset = 0;
        for (shared_ptr<RowItem> r : *this) {
-               r->set_v_offset(offset);
-               offset += SignalHeight + 2 * SignalMargin;
+               const pair<int, int> extents = r->v_extents();
+               if (r->enabled())
+                       offset += -extents.first;
+               r->force_to_v_offset(offset);
+               if (r->enabled())
+                       offset += extents.second;
        }
 
        update_layout();
-       normalize_layout();
-
-       // Update the child widgets
-       _header->signals_updated();
-       _viewport->signals_updated();
 }
 
 void View::data_updated()
@@ -549,9 +550,17 @@ void View::on_signals_moved()
        signals_moved();
 }
 
-void View::on_geometry_updated()
+void View::process_sticky_events()
 {
-       update_layout();
+       if (_sticky_events & SelectableItemHExtentsChanged)
+               update_layout();
+       if (_sticky_events & SelectableItemVExtentsChanged) {
+               _viewport->update();
+               _header->update();
+       }
+
+       // Clear the sticky events
+       _sticky_events = 0;
 }
 
 void View::on_hover_point_changed()