From c966d9b1ebb12386ac876d93f377fe3a470c6976 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Fri, 3 Jun 2022 17:11:32 -0400 Subject: Touch and pen input updates (#2172) * Remove unnecessary return * Move touch start input filtering * Refactor * Add scanOnTouchPress * Add preventPenScrolling * Rename scanOnPenPress to scanOnPenMove * Rename scanOnPenRelease to scanOnPenReleaseHover * Simplify * Refactor _searchAtFromPen early exit * Merge _penPointerPressed and _penPointerReleased into a single variable * Add more options * Simplify pen pointer coordinates * Implement scanOnPenPress and scanOnPenRelease * Implement scanOnTouchRelease * Fix tests * Don't search on touch cancel * Cancel touch if the touch action is used for scrolling or other gestures * Fix incorrect scroll prevention options being used * Organize options * Fix typos --- ext/data/schemas/options-schema.json | 42 +++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) (limited to 'ext/data') diff --git a/ext/data/schemas/options-schema.json b/ext/data/schemas/options-schema.json index 279be153..d7e3b5f4 100644 --- a/ext/data/schemas/options-schema.json +++ b/ext/data/schemas/options-schema.json @@ -457,10 +457,15 @@ "searchTerms": true, "searchKanji": true, "scanOnTouchMove": true, + "scanOnTouchPress": true, + "scanOnTouchRelease": false, + "scanOnPenMove": true, "scanOnPenHover": true, + "scanOnPenReleaseHover": false, "scanOnPenPress": true, "scanOnPenRelease": false, - "preventTouchScrolling": false + "preventTouchScrolling": false, + "preventPenScrolling": false } }, { @@ -476,10 +481,15 @@ "searchTerms": true, "searchKanji": true, "scanOnTouchMove": true, + "scanOnTouchPress": true, + "scanOnTouchRelease": false, + "scanOnPenMove": true, "scanOnPenHover": true, + "scanOnPenReleaseHover": false, "scanOnPenPress": true, "scanOnPenRelease": false, - "preventTouchScrolling": true + "preventTouchScrolling": true, + "preventPenScrolling": true } } ], @@ -528,10 +538,12 @@ "searchTerms", "searchKanji", "scanOnTouchMove", + "scanOnTouchPress", + "scanOnPenMove", "scanOnPenHover", - "scanOnPenPress", - "scanOnPenRelease", - "preventTouchScrolling" + "scanOnPenReleaseHover", + "preventTouchScrolling", + "preventPenScrolling" ], "properties": { "showAdvanced": { @@ -550,10 +562,26 @@ "type": "boolean", "default": true }, + "scanOnTouchPress": { + "type": "boolean", + "default": true + }, + "scanOnTouchRelease": { + "type": "boolean", + "default": false + }, + "scanOnPenMove": { + "type": "boolean", + "default": true + }, "scanOnPenHover": { "type": "boolean", "default": true }, + "scanOnPenReleaseHover": { + "type": "boolean", + "default": false + }, "scanOnPenPress": { "type": "boolean", "default": true @@ -565,6 +593,10 @@ "preventTouchScrolling": { "type": "boolean", "default": true + }, + "preventPenScrolling": { + "type": "boolean", + "default": true } } } -- cgit v1.2.3