X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=2a97eefc2dc1577b4afa7596fedf12a32114914c;hp=a5174bb37ecd000332a199cea5790a7792e83770;hb=453b6d63444bf7fb03242761653fd18e9cde7443;hpb=282905348863fe871a48c680bd12bc1dee364a43

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index a5174bb3..2a97eefc 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -22,7 +22,7 @@
 #include <QMouseEvent>
 #include <QTouchEvent>
 
-#include "rowitem.hpp"
+#include "tracetreeitem.hpp"
 #include "view.hpp"
 #include "viewwidget.hpp"
 
@@ -48,7 +48,11 @@ void ViewWidget::clear_selection()
 	const auto items = this->items();
 	for (auto &i : items)
 		i->select(false);
-	update();
+}
+
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+{
+	(void)item;
 }
 
 void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
@@ -59,9 +63,12 @@ void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 bool ViewWidget::accept_drag() const
 {
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+		view_.list_by_type<TraceTreeItem>());
 
-	const bool any_row_items_selected = any_of(view_.begin(), view_.end(),
-		[](const shared_ptr<RowItem> &r) { return r->selected(); });
+	const bool any_row_items_selected = any_of(
+		trace_tree_items.begin(), trace_tree_items.end(),
+		[](const shared_ptr<TraceTreeItem> &r) { return r->selected(); });
 
 	const bool any_time_items_selected = any_of(items.begin(), items.end(),
 		[](const shared_ptr<TimeItem> &i) { return i->selected(); });
@@ -69,12 +76,12 @@ bool ViewWidget::accept_drag() const
 	if (any_row_items_selected && !any_time_items_selected)
 	{
 		// Check all the drag items share a common owner
-		RowItemOwner *item_owner = nullptr;
-		for (shared_ptr<RowItem> r : view_)
+		TraceTreeItemOwner *item_owner = nullptr;
+		for (shared_ptr<TraceTreeItem> r : trace_tree_items)
 			if (r->dragging()) {
 				if (!item_owner)
 					item_owner = r->owner();
-				else if(item_owner != r->owner())
+				else if (item_owner != r->owner())
 					return false;
 			}
 
@@ -100,21 +107,30 @@ void ViewWidget::drag_items(const QPoint &delta)
 	bool item_dragged = false;
 
 	// Drag the row items
-	RowItemOwner *item_owner = nullptr;
-	for (std::shared_ptr<RowItem> r : view_)
+	const vector< shared_ptr<RowItem> > row_items(
+		view_.list_by_type<RowItem>());
+	for (shared_ptr<RowItem> r : row_items)
 		if (r->dragging()) {
-			item_owner = r->owner();
 			r->drag_by(delta);
 
 			// Ensure the trace is selected
 			r->select();
+
+			item_dragged = true;
 		}
 
+	// If an item is being dragged, update the stacking
+	TraceTreeItemOwner *item_owner = nullptr;
+	const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
+		view_.list_by_type<TraceTreeItem>());
+	for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+		if (i->dragging())
+			item_owner = i->owner();
+
 	if (item_owner) {
-		item_dragged = true;
 		item_owner->restack_items();
-		for (const auto &r : *item_owner)
-			r->animate_to_layout_v_offset();
+		for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+			i->animate_to_layout_v_offset();
 	}
 
 	// Drag the time items
@@ -177,7 +193,6 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
 		drag();
 
 	selection_changed();
-	update();
 }
 
 void ViewWidget::mouse_left_release_event(QMouseEvent *event)
@@ -196,7 +211,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 		i->drag_release();
 
 	if (item_dragging_)
-		view_.restack_all_row_items();
+		view_.restack_all_trace_tree_items();
 	else
 	{
 		if (!ctrl_pressed) {
@@ -256,26 +271,32 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 	mouse_down_item_ = nullptr;
 }
 
-void ViewWidget::mouseMoveEvent(QMouseEvent *event)
+void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 {
-	assert(event);
-	mouse_point_ = event->pos();
+	assert(e);
+	mouse_point_ = e->pos();
 
-	if (!(event->buttons() & Qt::LeftButton))
-		return;
+	if (!e->buttons())
+		item_hover(get_mouse_over_item(e->pos()));
+	else if (e->buttons() & Qt::LeftButton)
+	{
+		if (!item_dragging_)
+		{
+			if ((e->pos() - mouse_down_point_).manhattanLength() <
+				QApplication::startDragDistance())
+				return;
 
-	if ((event->pos() - mouse_down_point_).manhattanLength() <
-		QApplication::startDragDistance())
-		return;
+			if (!accept_drag())
+				return;
 
-	if (!accept_drag())
-		return;
+			item_dragging_ = true;
+		}
 
-	// Do the drag
-	item_dragging_ = true;
-	drag_items(event->pos() - mouse_down_point_);
+		// Do the drag
+		drag_items(e->pos() - mouse_down_point_);
 
-	update();
+		update();
+	}
 }
 
 void ViewWidget::leaveEvent(QEvent*)