X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=83985eda68a28f925e41e9641bdc87fa1fde57f9;hb=3e124bee223688078d60f007cfa078a1dcbfbfb3;hp=c19d10883af7fed3c77e3ee60d0f497faadb2958;hpb=859eed5994e0395cc7b69442f961b23ec0b19eed;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index c19d108..83985ed 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -80,7 +80,12 @@ QSize Header::extended_size_hint() const
 	return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
+vector< shared_ptr<ViewItem> > Header::items()
+{
+	return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
+}
+
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
 	const QRect r(0, 0, width() - BaselineOffset, height());
 	for (auto &i : view_)
@@ -96,19 +101,6 @@ void Header::clear_selection()
 	update();
 }
 
-void Header::show_popup(const shared_ptr<RowItem> &item)
-{
-	using pv::widgets::Popup;
-
-	Popup *const p = item->create_popup(&view_);
-	if (!p)
-		return;
-
-	const QPoint pt(width() - BaselineOffset, item->get_visual_y());
-	p->set_position(mapToGlobal(pt), Popup::Right);
-	p->show();
-}
-
 void Header::paintEvent(QPaintEvent*)
 {
 	// The trace labels are not drawn with the arrows exactly on the
@@ -187,7 +179,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 		QApplication::keyboardModifiers() & Qt::ControlModifier;
 
 	// Unselect everything if control is not pressed
-	const shared_ptr<RowItem> mouse_over =
+	const shared_ptr<ViewItem> mouse_over =
 		get_mouse_over_item(event->pos());
 
 	for (auto &r : view_)
@@ -247,11 +239,11 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	// Do the drag
 	dragging_ = true;
 
-	const int delta = event->pos().y() - mouse_down_point_.y();
+	const QPoint delta = event->pos() - mouse_down_point_;
 
 	for (std::shared_ptr<RowItem> r : view_)
 		if (r->dragging()) {
-			r->force_to_v_offset(r->drag_point().y() + delta);
+			r->drag_by(delta);
 
 			// Ensure the trace is selected
 			r->select();
@@ -265,15 +257,9 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	update();
 }
 
-void Header::leaveEvent(QEvent*)
-{
-	mouse_point_ = QPoint(-1, -1);
-	update();
-}
-
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-	const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
+	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
 	if (!r)
 		return;
 
@@ -327,8 +313,10 @@ void Header::on_group()
 			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	shared_ptr<TraceGroup> group(new TraceGroup());
+	shared_ptr<RowItem> mouse_down_item(
+		std::dynamic_pointer_cast<RowItem>(mouse_down_item_));
 	shared_ptr<RowItem> focus_item(
-		mouse_down_item_ ? mouse_down_item_ : selected_items.front());
+		mouse_down_item ? mouse_down_item : selected_items.front());
 
 	assert(focus_item);
 	assert(focus_item->owner());