From 6a6371bb1148b8e2c8a2087baf8f6ebc1b0d6df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 8 Apr 2019 15:21:11 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@521 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/graphic/graphic.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 2a25b5b..dbd3e41 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -155,7 +155,7 @@ bool Graphic::eventFilter(QObject * o, QEvent * e) { if (o == canvas) { switch (e->type()) { case QEvent::Gesture: - if (!gestures) break; + if (!navigation || !gestures) break; foreach (QGesture * g, ((QGestureEvent*)e)->gestures()) procGesture(g); break; @@ -164,11 +164,11 @@ bool Graphic::eventFilter(QObject * o, QEvent * e) { leaveFullscreen(); break; case QEvent::TouchBegin: - if (!gestures) break; + if (!navigation || !gestures) break; need_mouse_pan = true; break; case QEvent::TouchUpdate: { - if (!gestures) break; + if (!navigation || !gestures) break; QList tpl = ((QTouchEvent*)e)->touchPoints(); if (tpl.size() == 2) { need_mouse_pan = false; @@ -193,7 +193,7 @@ void Graphic::prepareCanvas(QWidget * w) { connect(w, SIGNAL(keyPressEvent(QKeyEvent * )), this, SLOT(canvasKeyPressEvent(QKeyEvent * ))); //w->grabGesture(Qt::TapGesture); w->grabGesture(Qt::TapAndHoldGesture); - //w->grabGesture(Qt::PanGesture); + w->grabGesture(Qt::PanGesture); w->grabGesture(Qt::PinchGesture); w->setMouseTracking(true); w->installEventFilter(this);