ViewWidget: Moved in event and touch_event

[pulseview.git] / pv / view / viewwidget.cpp

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 0b3b2fd1e233f962bc9f6b50417109e72582722b..816fbf513db042fa48dd6edd48fe7c68bd869453 100644 (file)
--- 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"
@@ -35,9 +36,10 @@ namespace view {
 ViewWidget::ViewWidget(View &parent) :
        QWidget(&parent),
        view_(parent),
-       dragging_(false)
+       item_dragging_(false)
 {
        setFocusPolicy(Qt::ClickFocus);
+       setAttribute(Qt::WA_AcceptTouchEvents, true);
        setMouseTracking(true);
 }
 
@@ -86,6 +88,12 @@ bool ViewWidget::accept_drag() const
        return false;
 }
 
+bool ViewWidget::mouse_down() const
+{
+       return mouse_down_point_.x() != INT_MIN &&
+               mouse_down_point_.y() != INT_MIN;
+}
+
 void ViewWidget::drag_items(const QPoint &delta)
 {
        // Drag the row items
@@ -157,7 +165,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
        for (auto &i : items)
                i->drag_release();
 
-       if (dragging_)
+       if (item_dragging_)
                view_.restack_all_row_items();
        else
        {
@@ -171,7 +179,30 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
                }
        }
 
-       dragging_ = false;
+       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)
@@ -191,6 +222,7 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
        if (event->button() & Qt::LeftButton)
                mouse_left_release_event(event);
 
+       mouse_down_point_ = QPoint(INT_MIN, INT_MIN);
        mouse_down_item_ = nullptr;
 }
 
@@ -210,7 +242,7 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *event)
                return;
 
        // Do the drag
-       dragging_ = true;
+       item_dragging_ = true;
        drag_items(event->pos() - mouse_down_point_);
 
        update();