Skip to content

Commit 616f660

Browse files
committed
fix multi touch qt6 and qt5
1 parent 7013645 commit 616f660

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/widgets/DrawingWidget.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -610,59 +610,55 @@ bool DrawingWidget::event(QEvent *ev) {
610610
foreach(const QTouchEvent::TouchPoint &touchPoint, touchPoints) {
611611
QPointF pos = touchPoint.position();
612612
if ((Qt::TouchPointState)touchPoint.state() == Qt::TouchPointPressed) {
613-
if(touchEvent->points().count() == 1) {
614-
// block single touch event (It ıs actually mouse event)
615-
break;
616-
}
617613
eventHandler(Qt::LeftButton, PRESS, touchPoint.id(), pos, touchPoint.pressure());
618614
} else if ((Qt::TouchPointState)touchPoint.state() == Qt::TouchPointReleased) {
619615
eventHandler(Qt::LeftButton, RELEASE, touchPoint.id(), pos, touchPoint.pressure());
620616
} else {
621617
eventHandler(Qt::LeftButton, MOVE, touchPoint.id(), pos, touchPoint.pressure());
622618
}
623619
}
624-
break;
620+
return true;
625621
}
626622
case QEvent::TabletPress: {
627623
tablet_enabled = true;
628624
QTabletEvent *tabletEvent = static_cast<QTabletEvent*>(ev);
629625
eventHandler(tabletEvent->buttons(), PRESS, -2, tabletEvent->position(), tabletEvent->pressure());
630-
break;
626+
return true;
631627
}
632628
case QEvent::TabletRelease: {
633629
tablet_enabled = false;
634630
QTabletEvent *tabletEvent = static_cast<QTabletEvent*>(ev);
635631
eventHandler(tabletEvent->buttons(), RELEASE, -2, tabletEvent->position(), tabletEvent->pressure());
636-
break;
632+
return true;
637633
}
638634
case QEvent::TabletMove: {
639635
QTabletEvent *tabletEvent = static_cast<QTabletEvent*>(ev);
640636
eventHandler(tabletEvent->buttons(), MOVE, -2, tabletEvent->position(), tabletEvent->pressure());
641-
break;
637+
return true;
642638
}
643639
case QEvent::MouseButtonPress: {
644640
if(tablet_enabled) {
645641
break;
646642
}
647643
QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(ev);
648644
eventHandler(mouseEvent->buttons(), PRESS, -1, mouseEvent->position(), 1.0);
649-
break;
645+
return true;
650646
}
651647
case QEvent::MouseButtonRelease: {
652648
if(tablet_enabled) {
653649
break;
654650
}
655651
QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(ev);
656652
eventHandler(mouseEvent->buttons(), RELEASE, -1, mouseEvent->position(), 1.0);
657-
break;
653+
return true;
658654
}
659655
case QEvent::MouseMove: {
660656
if(tablet_enabled) {
661657
break;
662658
}
663659
QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(ev);
664660
eventHandler(mouseEvent->buttons(), MOVE, -1, mouseEvent->position(), 1.0);
665-
break;
661+
return true;
666662
}
667663

668664
default:

0 commit comments

Comments
 (0)