Skip to content

Commit 53563ad

Browse files
BentEngbersLucaCras
BentEngbers
and
LucaCras
authored
add keys to gestures, so the sender (owner) can be identified (#217)
Co-authored-by: Luca Cras <[email protected]>
1 parent b2b3e76 commit 53563ad

File tree

4 files changed

+75
-17
lines changed

4 files changed

+75
-17
lines changed

‎lib/src/chart/chart.dart

+50-2
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
252252
gestureLocalPosition,
253253
size,
254254
null,
255+
key: widget.key,
255256
));
256257
},
257258
onDoubleTapCancel: () {
@@ -261,6 +262,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
261262
gestureLocalPosition,
262263
size,
263264
null,
265+
key: widget.key,
264266
));
265267
},
266268
onDoubleTapDown: (detail) {
@@ -271,6 +273,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
271273
gestureLocalPosition,
272274
size,
273275
detail,
276+
key: widget.key,
274277
));
275278
},
276279
onForcePressEnd: (detail) {
@@ -281,6 +284,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
281284
gestureLocalPosition,
282285
size,
283286
detail,
287+
key: widget.key,
284288
));
285289
},
286290
onForcePressPeak: (detail) {
@@ -291,6 +295,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
291295
gestureLocalPosition,
292296
size,
293297
detail,
298+
key: widget.key,
294299
));
295300
},
296301
onForcePressStart: (detail) {
@@ -301,6 +306,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
301306
gestureLocalPosition,
302307
size,
303308
detail,
309+
key: widget.key,
304310
));
305311
},
306312
onForcePressUpdate: (detail) {
@@ -311,6 +317,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
311317
gestureLocalPosition,
312318
size,
313319
detail,
320+
key: widget.key,
314321
));
315322
},
316323
onLongPress: () {
@@ -320,6 +327,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
320327
gestureLocalPosition,
321328
size,
322329
null,
330+
key: widget.key,
323331
));
324332
},
325333
onLongPressCancel: () {
@@ -329,6 +337,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
329337
gestureLocalPosition,
330338
size,
331339
null,
340+
key: widget.key,
332341
));
333342
},
334343
onLongPressDown: (detail) {
@@ -339,6 +348,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
339348
gestureLocalPosition,
340349
size,
341350
detail,
351+
key: widget.key,
342352
));
343353
},
344354
onLongPressEnd: (detail) {
@@ -350,6 +360,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
350360
gestureLocalPosition,
351361
size,
352362
detail,
363+
key: widget.key,
353364
));
354365
},
355366
onLongPressMoveUpdate: (detail) {
@@ -361,6 +372,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
361372
size,
362373
detail,
363374
localMoveStart: gestureLocalMoveStart,
375+
key: widget.key,
364376
));
365377
},
366378
onLongPressStart: (detail) {
@@ -372,6 +384,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
372384
gestureLocalPosition,
373385
size,
374386
detail,
387+
key: widget.key,
375388
));
376389
},
377390
onLongPressUp: () {
@@ -381,18 +394,21 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
381394
gestureLocalPosition,
382395
size,
383396
null,
397+
key: widget.key,
384398
));
385399
},
386400
onScaleEnd: (detail) {
387-
gestureLocalMoveStart = null;
388-
gestureScaleDetail = null;
389401
view!.gesture(Gesture(
390402
GestureType.scaleEnd,
391403
gestureKind,
392404
gestureLocalPosition,
393405
size,
394406
detail,
407+
localMoveStart: gestureLocalMoveStart,
408+
key: widget.key,
395409
));
410+
gestureLocalMoveStart = null;
411+
gestureScaleDetail = null;
396412
},
397413
onScaleStart: (detail) {
398414
gestureLocalPosition = detail.localFocalPoint;
@@ -410,6 +426,8 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
410426
gestureLocalPosition,
411427
size,
412428
detail,
429+
localMoveStart: gestureLocalMoveStart,
430+
key: widget.key,
413431
));
414432
},
415433
onScaleUpdate: (detail) {
@@ -422,6 +440,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
422440
detail,
423441
localMoveStart: gestureLocalMoveStart,
424442
preScaleDetail: gestureScaleDetail,
443+
key: widget.key,
425444
));
426445
gestureScaleDetail = detail;
427446
},
@@ -432,6 +451,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
432451
gestureLocalPosition,
433452
size,
434453
null,
454+
key: widget.key,
435455
));
436456
},
437457
onSecondaryLongPressCancel: () {
@@ -441,6 +461,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
441461
gestureLocalPosition,
442462
size,
443463
null,
464+
key: widget.key,
444465
));
445466
},
446467
onSecondaryLongPressDown: (detail) {
@@ -451,6 +472,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
451472
gestureLocalPosition,
452473
size,
453474
detail,
475+
key: widget.key,
454476
));
455477
},
456478
onSecondaryLongPressEnd: (detail) {
@@ -462,6 +484,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
462484
gestureLocalPosition,
463485
size,
464486
detail,
487+
key: widget.key,
465488
));
466489
},
467490
onSecondaryLongPressMoveUpdate: (detail) {
@@ -473,6 +496,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
473496
size,
474497
detail,
475498
localMoveStart: gestureLocalMoveStart,
499+
key: widget.key,
476500
));
477501
},
478502
onSecondaryLongPressStart: (detail) {
@@ -484,6 +508,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
484508
gestureLocalPosition,
485509
size,
486510
detail,
511+
key: widget.key,
487512
));
488513
},
489514
onSecondaryLongPressUp: () {
@@ -493,6 +518,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
493518
gestureLocalPosition,
494519
size,
495520
null,
521+
key: widget.key,
496522
));
497523
},
498524
onSecondaryTap: () {
@@ -502,6 +528,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
502528
gestureLocalPosition,
503529
size,
504530
null,
531+
key: widget.key,
505532
));
506533
},
507534
onSecondaryTapCancel: () {
@@ -511,6 +538,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
511538
gestureLocalPosition,
512539
size,
513540
null,
541+
key: widget.key,
514542
));
515543
},
516544
onSecondaryTapDown: (detail) {
@@ -521,6 +549,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
521549
gestureLocalPosition,
522550
size,
523551
detail,
552+
key: widget.key,
524553
));
525554
},
526555
onSecondaryTapUp: (detail) {
@@ -531,6 +560,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
531560
gestureLocalPosition,
532561
size,
533562
detail,
563+
key: widget.key,
534564
));
535565
},
536566
onTap: () {
@@ -540,6 +570,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
540570
gestureLocalPosition,
541571
size,
542572
null,
573+
key: widget.key,
543574
));
544575
},
545576
onTapCancel: () {
@@ -549,6 +580,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
549580
gestureLocalPosition,
550581
size,
551582
null,
583+
key: widget.key,
552584
));
553585
},
554586
onTapDown: (detail) {
@@ -559,6 +591,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
559591
gestureLocalPosition,
560592
size,
561593
detail,
594+
key: widget.key,
562595
));
563596
},
564597
onTapUp: (detail) {
@@ -569,6 +602,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
569602
gestureLocalPosition,
570603
size,
571604
detail,
605+
key: widget.key,
572606
));
573607
},
574608
onTertiaryLongPress: () {
@@ -578,6 +612,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
578612
gestureLocalPosition,
579613
size,
580614
null,
615+
key: widget.key,
581616
));
582617
},
583618
onTertiaryLongPressCancel: () {
@@ -587,6 +622,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
587622
gestureLocalPosition,
588623
size,
589624
null,
625+
key: widget.key,
590626
));
591627
},
592628
onTertiaryLongPressDown: (detail) {
@@ -597,6 +633,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
597633
gestureLocalPosition,
598634
size,
599635
detail,
636+
key: widget.key,
600637
));
601638
},
602639
onTertiaryLongPressEnd: (detail) {
@@ -608,6 +645,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
608645
gestureLocalPosition,
609646
size,
610647
detail,
648+
key: widget.key,
611649
));
612650
},
613651
onTertiaryLongPressMoveUpdate: (detail) {
@@ -619,6 +657,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
619657
size,
620658
detail,
621659
localMoveStart: gestureLocalMoveStart,
660+
key: widget.key,
622661
));
623662
},
624663
onTertiaryLongPressStart: (detail) {
@@ -630,6 +669,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
630669
gestureLocalPosition,
631670
size,
632671
detail,
672+
key: widget.key,
633673
));
634674
},
635675
onTertiaryLongPressUp: () {
@@ -639,6 +679,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
639679
gestureLocalPosition,
640680
size,
641681
null,
682+
key: widget.key,
642683
));
643684
},
644685
onTertiaryTapCancel: () {
@@ -648,6 +689,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
648689
gestureLocalPosition,
649690
size,
650691
null,
692+
key: widget.key,
651693
));
652694
},
653695
onTertiaryTapDown: (detail) {
@@ -658,6 +700,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
658700
gestureLocalPosition,
659701
size,
660702
detail,
703+
key: widget.key,
661704
));
662705
},
663706
onTertiaryTapUp: (detail) {
@@ -668,6 +711,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
668711
gestureLocalPosition,
669712
size,
670713
detail,
714+
key: widget.key,
671715
));
672716
},
673717
),
@@ -680,6 +724,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
680724
gestureLocalPosition,
681725
size,
682726
null,
727+
key: widget.key,
683728
));
684729
},
685730
onPointerSignal: (event) {
@@ -691,6 +736,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
691736
gestureLocalPosition,
692737
size,
693738
event.scrollDelta,
739+
key: widget.key,
694740
));
695741
}
696742
},
@@ -704,6 +750,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
704750
gestureLocalPosition,
705751
size,
706752
null,
753+
key: widget.key,
707754
));
708755
},
709756
onExit: (event) {
@@ -715,6 +762,7 @@ class ChartState<D> extends State<Chart<D>> with TickerProviderStateMixin {
715762
gestureLocalPosition,
716763
size,
717764
null,
765+
key: widget.key,
718766
));
719767
},
720768
),

0 commit comments

Comments
 (0)