X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=3811c1e8a143d70b6dc8f03115d1ead1e529c07e;hp=c55e76a2d301d0ce1b9e362a33194dbbe0909848;hb=92ff2b60d60c8191a6f4a923b5a9099ec544adbd;hpb=cc88566ce77bed57358a82dec5da648feb66d10b

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index c55e76a2..3811c1e8 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -57,17 +57,18 @@ Viewport::Viewport(View &parent) :
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {
+	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 	const vector< shared_ptr<ViewItem> > items(this->items());
 	for (auto i = items.rbegin(); i != items.rend(); i++)
 		if ((*i)->enabled() &&
-			(*i)->hit_box_rect(rect()).contains(pt))
+			(*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
 
 void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 {
-	if (item)
+	if (item && item->is_draggable())
 		setCursor(dynamic_pointer_cast<RowItem>(item) ?
 			Qt::SizeVerCursor : Qt::SizeHorCursor);
 	else
@@ -96,10 +97,9 @@ void Viewport::drag_release()
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
 	vector< shared_ptr<ViewItem> > items;
-	const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
-		view_.list_by_type<TraceTreeItem>());
-	copy(trace_tree_items.begin(), trace_tree_items.end(),
-		back_inserter(items));
+	const std::vector< shared_ptr<ViewItem> > view_items(
+		view_.list_by_type<ViewItem>());
+	copy(view_items.begin(), view_items.end(), back_inserter(items));
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	copy(time_items.begin(), time_items.end(), back_inserter(items));
 	return items;
@@ -152,14 +152,13 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	vector< shared_ptr<TraceTreeItem> > trace_tree_items(
-		view_.list_by_type<TraceTreeItem>());
-	assert(none_of(trace_tree_items.begin(), trace_tree_items.end(),
-		[](const shared_ptr<TraceTreeItem> &r) { return !r; }));
+	vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
+	assert(none_of(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &r) { return !r; }));
 
-	stable_sort(trace_tree_items.begin(), trace_tree_items.end(),
-		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
-			return a->visual_v_offset() < b->visual_v_offset(); });
+	stable_sort(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->point(QRect()).y() < b->point(QRect()).y(); });
 
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	assert(none_of(time_items.begin(), time_items.end(),
@@ -172,18 +171,18 @@ void Viewport::paintEvent(QPaintEvent*)
 
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_back(p, pp);
-	for (const shared_ptr<TraceTreeItem> r : trace_tree_items)
+	for (const shared_ptr<RowItem> r : row_items)
 		r->paint_back(p, pp);
 
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_mid(p, pp);
-	for (const shared_ptr<TraceTreeItem> r : trace_tree_items)
+	for (const shared_ptr<RowItem> r : row_items)
 		r->paint_mid(p, pp);
 
-	p.setRenderHint(QPainter::Antialiasing, false);
-
-	for (const shared_ptr<TraceTreeItem> r : trace_tree_items)
+	for (const shared_ptr<RowItem> r : row_items)
 		r->paint_fore(p, pp);
+
+	p.setRenderHint(QPainter::Antialiasing, false);
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_fore(p, pp);