X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=e364d6385f61eb9768b5b0afc9995adda4840bee;hp=e2b2d17295f3295bc429f550548d95545c3ca1f3;hb=e8b969a9ae4e0a683eabddc8ded7babaf03844fd;hpb=1f1edc092680e9182be07a760ad03d00b8c5ca06

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index e2b2d172..e364d638 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -20,6 +20,7 @@
 
 #include <QApplication>
 #include <QMouseEvent>
+#include <QTouchEvent>
 
 #include "rowitem.hpp"
 #include "view.hpp"
@@ -38,6 +39,7 @@ ViewWidget::ViewWidget(View &parent) :
 	item_dragging_(false)
 {
 	setFocusPolicy(Qt::ClickFocus);
+	setAttribute(Qt::WA_AcceptTouchEvents, true);
 	setMouseTracking(true);
 }
 
@@ -49,6 +51,11 @@ void ViewWidget::clear_selection()
 	update();
 }
 
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+{
+	(void)item;
+}
+
 void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
 {
 	(void)item;
@@ -83,7 +90,8 @@ bool ViewWidget::accept_drag() const
 		return true;
 	}
 
-	return false;
+	// A background drag is beginning
+	return true;
 }
 
 bool ViewWidget::mouse_down() const
@@ -94,6 +102,8 @@ bool ViewWidget::mouse_down() const
 
 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_)
@@ -106,6 +116,7 @@ void ViewWidget::drag_items(const QPoint &delta)
 		}
 
 	if (item_owner) {
+		item_dragged = true;
 		item_owner->restack_items();
 		for (const auto &r : *item_owner)
 			r->animate_to_layout_v_offset();
@@ -114,8 +125,27 @@ void ViewWidget::drag_items(const QPoint &delta)
 	// Drag the time items
 	const vector< shared_ptr<TimeItem> > items(view_.time_items());
 	for (auto &i : items)
-		if (i->dragging())
+		if (i->dragging()) {
 			i->drag_by(delta);
+			item_dragged = true;
+		}
+
+	// Do the background drag
+	if (!item_dragged)
+		drag_by(delta);
+}
+
+void ViewWidget::drag()
+{
+}
+
+void ViewWidget::drag_by(const QPoint &delta)
+{
+	(void)delta;
+}
+
+void ViewWidget::drag_release()
+{
 }
 
 void ViewWidget::mouse_left_press_event(QMouseEvent *event)
@@ -139,10 +169,17 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
 	}
 
 	// Save the offsets of any signals which will be dragged
+	bool item_dragged = false;
 	const auto items = this->items();
 	for (auto &i : items)
-		if (i->selected())
+		if (i->selected()) {
+			item_dragged = true;
 			i->drag();
+		}
+
+	// Do the background drag
+	if (!item_dragged)
+		drag();
 
 	selection_changed();
 	update();
@@ -180,6 +217,29 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 	item_dragging_ = false;
 }
 
+bool ViewWidget::touch_event(QTouchEvent *e)
+{
+	(void)e;
+	return false;
+}
+
+bool ViewWidget::event(QEvent *event)
+{
+	switch (event->type()) {
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
+		if (touch_event(static_cast<QTouchEvent *>(event)))
+			return true;
+		break;
+
+	default:
+		break;
+	}
+
+	return QWidget::event(event);
+}
+
 void ViewWidget::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
@@ -201,26 +261,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*)