View: Store CursorPair in a shared_ptr

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

diff --git a/pv/view/rowitemowner.cpp b/pv/view/rowitemowner.cpp
index 0fa230ab4e3fb47a609c105cb1de0dc91ad4d277..625620ed0dbe2d074d82764cd6bbd47f3f8e0fed 100644 (file)
--- a/pv/view/rowitemowner.cpp
+++ b/pv/view/rowitemowner.cpp
@@ -20,8 +20,8 @@
 
 #include <cassert>
 
-#include "rowitem.h"
-#include "rowitemowner.h"
+#include "rowitem.hpp"
+#include "rowitemowner.hpp"
 
 using std::max;
 using std::make_pair;
@@ -35,42 +35,46 @@ namespace view {
 
 vector< shared_ptr<RowItem> >& RowItemOwner::child_items()
 {
-       return _items;
+       return items_;
 }
 
 const vector< shared_ptr<RowItem> >& RowItemOwner::child_items() const
 {
-       return _items;
+       return items_;
 }
 
 void RowItemOwner::clear_child_items()
 {
-       for (auto &i : _items) {
+       for (auto &i : items_) {
                assert(i->owner() == this);
                i->set_owner(nullptr);
        }
-       _items.clear();
+       items_.clear();
 }
 
 void RowItemOwner::add_child_item(std::shared_ptr<RowItem> item)
 {
        assert(!item->owner());
        item->set_owner(this);
-       _items.push_back(item);
+       items_.push_back(item);
+
+       extents_changed(true, true);
 }
 
 void RowItemOwner::remove_child_item(std::shared_ptr<RowItem> item)
 {
        assert(item->owner() == this);
        item->set_owner(nullptr);
-       auto iter = std::find(_items.begin(), _items.end(), item);
-       assert(iter != _items.end());
-       _items.erase(iter);
+       auto iter = std::find(items_.begin(), items_.end(), item);
+       assert(iter != items_.end());
+       items_.erase(iter);
+
+       extents_changed(true, true);
 }
 
 RowItemOwner::iterator RowItemOwner::begin()
 {
-       return iterator(this, _items.begin());
+       return iterator(this, items_.begin());
 }
 
 RowItemOwner::iterator RowItemOwner::end()
@@ -80,7 +84,7 @@ RowItemOwner::iterator RowItemOwner::end()
 
 RowItemOwner::const_iterator RowItemOwner::begin() const
 {
-       return const_iterator(this, _items.cbegin());
+       return const_iterator(this, items_.cbegin());
 }
 
 RowItemOwner::const_iterator RowItemOwner::end() const
@@ -96,7 +100,7 @@ pair<int, int> RowItemOwner::v_extents() const
                if (!r->enabled())
                        continue;
 
-               const int child_offset = r->v_offset();
+               const int child_offset = r->layout_v_offset();
                const pair<int, int> child_extents = r->v_extents();
                extents.first = min(child_extents.first + child_offset,
                        extents.first);
@@ -107,5 +111,9 @@ pair<int, int> RowItemOwner::v_extents() const
        return extents;
 }
 
+void RowItemOwner::restack_items()
+{
+}
+
 } // view
 } // pv