support touchscreen even on non android device

silicon-heaven · Oct 21, 2024 · ba2dc75 · ba2dc75
1 parent 80671b4
commit ba2dc75
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/libshvvisu/include/shv/visu/svgscene/graphicsview.h b/libshvvisu/include/shv/visu/svgscene/graphicsview.h
@@ -25,9 +25,7 @@ class SHVVISU_DECL_EXPORT GraphicsView : public QGraphicsView
 	void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
 	void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
 
-#ifdef ANDROID
 	bool event(QEvent *event) override;
-#endif
 
 private:
 	QPoint m_dragMouseStartPos;

diff --git a/libshvvisu/src/svgscene/graphicsview.cpp b/libshvvisu/src/svgscene/graphicsview.cpp
@@ -2,22 +2,32 @@
 
 #include <shv/visu/svgscene/graphicsview.h>
 
+#if QT_VERSION_MAJOR >= 6
+#include <QInputDevice>
+#endif
 #include <QMouseEvent>
 
-#ifdef ANDROID
 #include <QGestureEvent>
 #include <QScroller>
-#endif
 
 namespace shv::visu::svgscene {
 
 GraphicsView::GraphicsView(QWidget *parent)
 	: Super(parent)
 {
+#if QT_VERSION_MAJOR >= 6
+	for (const auto &id : QInputDevice::devices()) {
+		if (id->type() == QInputDevice::DeviceType::TouchScreen) {
+			QScroller::grabGesture(viewport(), QScroller::LeftMouseButtonGesture);
+			grabGesture(Qt::PinchGesture);
+		}
+	}
+#else
 #ifdef ANDROID
 	QScroller::grabGesture(viewport(), QScroller::LeftMouseButtonGesture);
 	grabGesture(Qt::PinchGesture);
 #endif
+#endif
 }
 
 void GraphicsView::zoomToFit()
@@ -105,7 +115,6 @@ void GraphicsView::mouseMoveEvent(QMouseEvent* ev)
 	Super::mouseMoveEvent(ev);
 }
 
-#ifdef ANDROID
 bool GraphicsView::event(QEvent *event)
 {
 	if (event->type() == QEvent::Gesture) {
@@ -124,6 +133,5 @@ bool GraphicsView::event(QEvent *event)
 	}
 	return Super::event(event);
 }
-#endif
 
 }