Skip to content

Commit 9ad34d6

Browse files
committed
typescript: match showMenu implementation
e.g. from espruino/BangleApps#3804 (comment) aka: - espruino/BangleApps#3604 - #2565 - espruino/BangleApps#3609 - #2569
1 parent fb921e3 commit 9ad34d6

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

libs/banglejs/jswrap_bangle.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,8 @@ Bangle.js 1 is only capable of detecting left/right swipes as it only contains a
484484
2 zone touchscreen.
485485
*/
486486
/*TYPESCRIPT
487-
type TouchCallback = (button: number, xy?: { x: number, y: number }) => void;
487+
type TouchCallbackXY = { x: number, y: number, type: 0 | 2 };
488+
type TouchCallback = (button?: number, xy?: TouchCallbackXY) => void;
488489
*/
489490
/*JSON{
490491
"type" : "event",

libs/pixljs/jswrap_pixljs.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ DEPRECATED: Use `E.showMenu`
498498
type MenuBooleanItem = {
499499
value: boolean;
500500
format?: (value: boolean) => string;
501-
onchange?: (value: boolean) => void;
501+
onchange?: (value: boolean, evt?: TouchCallbackXY) => void;
502502
};
503503
504504
/**
@@ -507,7 +507,7 @@ type MenuBooleanItem = {
507507
type MenuNumberItem = {
508508
value: number;
509509
format?: (value: number) => string;
510-
onchange?: (value: number) => void;
510+
onchange?: (value: number, evt?: TouchCallbackXY) => void;
511511
step?: number;
512512
min?: number;
513513
max?: number;
@@ -543,10 +543,10 @@ type Menu = {
543543
""?: MenuOptions;
544544
[key: string]:
545545
| MenuOptions
546-
| (() => void)
546+
| ((e?: TouchCallbackXY) => void)
547547
| MenuBooleanItem
548548
| MenuNumberItem
549-
| { value: string; onchange?: () => void }
549+
| { value: string; onchange?: (value: unknown, evt?: TouchCallbackXY) => void }
550550
| undefined;
551551
};
552552
@@ -555,8 +555,6 @@ type Menu = {
555555
*\/
556556
type MenuInstance = {
557557
draw: () => void;
558-
move: (n: number) => void;
559-
select: () => void;
560558
scroller?: MenuScroller; // BangleJS 2
561559
};
562560

0 commit comments

Comments
 (0)