empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prevent multitouch from accidentally deleting stickers.

Browse source
This commit is contained in:
Greyson Parrelli 2021-09-09 10:49:40 -04:00
parent 9f3765d368
commit b0d0814b88
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
View file

@ -306,7 +306,13 @@ public final class ImageEditorView extends FrameLayout {
if (editSession != null) { if (editSession != null) {
editSession.commit(); editSession.commit();
dragDropRelease(false); dragDropRelease(false);
notifyDragEnd(editSession.getSelected(), checkTrashIntersect(getPoint(event)));
PointF point = getPoint(event);
boolean hittingTrash = event.getPointerCount() == 1 &&
checkTrashIntersect(point) &&
model.findElementAtPoint(point, viewMatrix, new Matrix()) == editSession.getSelected();
notifyDragEnd(editSession.getSelected(), hittingTrash);
editSession = null; editSession = null;
model.postEdit(moreThanOnePointerUsedInSession); model.postEdit(moreThanOnePointerUsedInSession);