fix bug where lock event would conflict with menu UI
parent
71ff4afb39
commit
041a8ef910
|
|
@ -57,7 +57,7 @@ function writeSettings() {
|
||||||
let inMenu = false;
|
let inMenu = false;
|
||||||
|
|
||||||
Bangle.on('touch', function (zone, e) {
|
Bangle.on('touch', function (zone, e) {
|
||||||
if (!inMenu) {
|
if (!inMenu && e.y > 24) {
|
||||||
if (drawTimeout) clearTimeout(drawTimeout);
|
if (drawTimeout) clearTimeout(drawTimeout);
|
||||||
E.showMenu(menu);
|
E.showMenu(menu);
|
||||||
inMenu = true;
|
inMenu = true;
|
||||||
|
|
@ -276,6 +276,10 @@ function updateQueueMillis(displaySeconds) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Bangle.on('lock', function (on, reason) {
|
Bangle.on('lock', function (on, reason) {
|
||||||
|
if (inMenu) { // if already in a menu, nothing to do
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (on) { // screen is locked
|
if (on) { // screen is locked
|
||||||
temp_displaySeconds = false;
|
temp_displaySeconds = false;
|
||||||
updateQueueMillis(false);
|
updateQueueMillis(false);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue