SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@521 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-04-08 15:21:11 +00:00
parent 4bce643660
commit 6a6371bb11
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qad/graphic/graphic.cpp
View File

@@ -155,7 +155,7 @@ bool Graphic::eventFilter(QObject * o, QEvent * e) {
if (o == canvas) { if (o == canvas) {
switch (e->type()) { switch (e->type()) {
case QEvent::Gesture: case QEvent::Gesture:
if (!gestures) break; if (!navigation || !gestures) break;
foreach (QGesture * g, ((QGestureEvent*)e)->gestures()) foreach (QGesture * g, ((QGestureEvent*)e)->gestures())
procGesture(g); procGesture(g);
break; break;
@@ -164,11 +164,11 @@ bool Graphic::eventFilter(QObject * o, QEvent * e) {
leaveFullscreen(); leaveFullscreen();
break; break;
case QEvent::TouchBegin: case QEvent::TouchBegin:
if (!gestures) break; if (!navigation || !gestures) break;
need_mouse_pan = true; need_mouse_pan = true;
break; break;
case QEvent::TouchUpdate: { case QEvent::TouchUpdate: {
if (!gestures) break; if (!navigation || !gestures) break;
QList<QTouchEvent::TouchPoint> tpl = ((QTouchEvent*)e)->touchPoints(); QList<QTouchEvent::TouchPoint> tpl = ((QTouchEvent*)e)->touchPoints();
if (tpl.size() == 2) { if (tpl.size() == 2) {
need_mouse_pan = false; need_mouse_pan = false;
@@ -193,7 +193,7 @@ void Graphic::prepareCanvas(QWidget * w) {
connect(w, SIGNAL(keyPressEvent(QKeyEvent * )), this, SLOT(canvasKeyPressEvent(QKeyEvent * ))); connect(w, SIGNAL(keyPressEvent(QKeyEvent * )), this, SLOT(canvasKeyPressEvent(QKeyEvent * )));
//w->grabGesture(Qt::TapGesture); //w->grabGesture(Qt::TapGesture);
w->grabGesture(Qt::TapAndHoldGesture); w->grabGesture(Qt::TapAndHoldGesture);
//w->grabGesture(Qt::PanGesture); w->grabGesture(Qt::PanGesture);
w->grabGesture(Qt::PinchGesture); w->grabGesture(Qt::PinchGesture);
w->setMouseTracking(true); w->setMouseTracking(true);
w->installEventFilter(this); w->installEventFilter(this);