X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Frowitem.cpp;h=861d4adf05d28763640c12a2dac1a27d4f308f4c;hp=d850e321fe4fdcf0572065e268d6393fa3af8982;hb=c3bb03ffcd63e5bb4a98e46313a71de96a544081;hpb=0dda6fe595932b2e340930104fad8ac4fc574895

diff --git a/pv/view/rowitem.cpp b/pv/view/rowitem.cpp
index d850e321..861d4adf 100644
--- a/pv/view/rowitem.cpp
+++ b/pv/view/rowitem.cpp
@@ -20,70 +20,104 @@
 
 #include <assert.h>
 
-#include "view.h"
+#include "view.hpp"
 
-#include "rowitem.h"
+#include "rowitem.hpp"
 
 namespace pv {
 namespace view {
 
 RowItem::RowItem() :
-	_owner(NULL),
-	_v_offset(0)
+	owner_(NULL),
+	layout_v_offset_(0),
+	visual_v_offset_(0),
+	v_offset_animation_(this, "visual_v_offset")
 {
 }
 
-int RowItem::v_offset() const
+int RowItem::layout_v_offset() const
 {
-	return _v_offset;
+	return layout_v_offset_;
 }
 
-void RowItem::set_v_offset(int v_offset)
+void RowItem::set_layout_v_offset(int v_offset)
 {
-	_v_offset = v_offset;
+	if (layout_v_offset_ == v_offset)
+		return;
+
+	layout_v_offset_ = v_offset;
+
+	if (owner_)
+		owner_->extents_changed(false, true);
 }
 
-RowItemOwner* RowItem::owner() const
+int RowItem::visual_v_offset() const
 {
-	return _owner;
+	return visual_v_offset_;
 }
 
-void RowItem::set_owner(RowItemOwner *owner)
+void RowItem::set_visual_v_offset(int v_offset)
+{
+	visual_v_offset_ = v_offset;
+
+	if (owner_)
+		owner_->row_item_appearance_changed(true, true);
+}
+
+void RowItem::force_to_v_offset(int v_offset)
 {
-	assert((_owner && !owner) || (!_owner && owner));
-	_owner = owner;
+	v_offset_animation_.stop();
+	layout_v_offset_ = visual_v_offset_ = v_offset;
 }
 
-int RowItem::get_y() const
+void RowItem::animate_to_layout_v_offset()
 {
-	assert(_owner);
-	return _v_offset + _owner->owner_v_offset();
+	if (visual_v_offset_ == layout_v_offset_ ||
+		(v_offset_animation_.endValue() == layout_v_offset_ &&
+		v_offset_animation_.state() == QAbstractAnimation::Running))
+		return;
+
+	v_offset_animation_.setDuration(100);
+	v_offset_animation_.setStartValue(visual_v_offset_);
+	v_offset_animation_.setEndValue(layout_v_offset_);
+	v_offset_animation_.setEasingCurve(QEasingCurve::OutQuad);
+	v_offset_animation_.start();
 }
 
-QPoint RowItem::point() const
+RowItemOwner* RowItem::owner() const
 {
-	return QPoint(0, v_offset());
+	return owner_;
 }
 
-void RowItem::paint_back(QPainter &p, int left, int right)
+void RowItem::set_owner(RowItemOwner *owner)
 {
-	(void)p;
-	(void)left;
-	(void)right;
+	assert(owner_ || owner);
+	v_offset_animation_.stop();
+
+	if (owner_) {
+		const int owner_offset = owner_->owner_visual_v_offset();
+		layout_v_offset_ += owner_offset;
+		visual_v_offset_ += owner_offset;
+	}
+
+	owner_ = owner;
+
+	if (owner_) {
+		const int owner_offset = owner_->owner_visual_v_offset();
+		layout_v_offset_ -= owner_offset;
+		visual_v_offset_ -= owner_offset;
+	}
 }
 
-void RowItem::paint_mid(QPainter &p, int left, int right)
+int RowItem::get_visual_y() const
 {
-	(void)p;
-	(void)left;
-	(void)right;
+	assert(owner_);
+	return visual_v_offset_ + owner_->owner_visual_v_offset();
 }
 
-void RowItem::paint_fore(QPainter &p, int left, int right)
+QPoint RowItem::point(const QRect &rect) const
 {
-	(void)p;
-	(void)left;
-	(void)right;
+	return QPoint(rect.right(), get_visual_y());
 }
 
 void RowItem::hover_point_changed()