RowItemOwner: Added depth() method

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 37c3b14a1380f45994648099944625b8f4295c21..ba095fb808d083a98397740554de5bc3a4096c0e 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -105,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()));
 
@@ -123,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);
@@ -184,6 +186,11 @@ int View::owner_v_offset() const
        return -_v_offset;
 }
 
+unsigned int View::depth() const
+{
+       return 0;
+}
+
 void View::zoom(double steps)
 {
        zoom(steps, _viewport->width() / 2);
@@ -320,20 +327,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);
@@ -468,6 +461,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)
@@ -517,17 +526,12 @@ void View::signals_changed()
                const pair<int, int> extents = r->v_extents();
                if (r->enabled())
                        offset += -extents.first;
-               r->set_v_offset(offset);
+               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()
@@ -551,9 +555,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()