From 7bf3a846c22a14457109dc1a933ec9b16821f4da Mon Sep 17 00:00:00 2001
From: thyttan <6uuxstm66@mozmail.com⁩>
Date: Thu, 19 Oct 2023 19:22:37 +0200
Subject: [PATCH] setting: Prepend 'LCD->Calibration' touch listener

...and stop event propagation.
---
 apps/setting/ChangeLog     | 4 +++-
 apps/setting/metadata.json | 2 +-
 apps/setting/settings.js   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 4f4196e32..1fdeada0d 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -71,4 +71,6 @@ of 'Select Clock'
 0.62: Fix whitelist showing as 'on' by default when it's not after 0.59
 0.63: Whitelist: Try to resolve peer addresses using NRF.resolveAddress() - for 2v19 or 2v18 cutting edge builds
       Remove 'beta' label from passkey - it's been around for a while and works ok
-0.64: Default to wakeOnTwist being off
\ No newline at end of file
+0.64: Default to wakeOnTwist being off
+0.65: Prepend 'LCD->Calibration' touch listener and stop event propagation.
+
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 07376468a..4b5a02135 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.64",
+  "version": "0.65",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index d19bb14d7..2a928a7a0 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -899,6 +899,7 @@ function showTouchscreenCalibration() {
   }
 
   function touchHandler(_,e) {
+    E.stopEventPropagation&&E.stopEventPropagation();
     var spot = corners[currentCorner];
     // store averages
     if (spot[0]*2 < g.getWidth())
@@ -921,7 +922,7 @@ function showTouchscreenCalibration() {
     }
     showTapSpot();
   }
-  Bangle.on('touch', touchHandler);
+  Bangle.prependListener&&Bangle.prependListener('touch',touchHandler)||Bangle.on('touch',touchHandler);
 
   showTapSpot();
 }