Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1487 from hughbarney/master 

Stopwatch touch - adjust on touch for x,y outside the dimensions of g.getW/H
master
Gordon Williams 2022-02-21 11:20:27 +00:00 committed by GitHub
parent 0bbeb2765d 7f515b172a
commit ea8b52bdd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/stopwatch/ChangeLog
View File

@ -1 +1,2 @@
0.01: first release 0.01: first release
0.02: Adjust for touch events outside of screen g dimensions

2
apps/stopwatch/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "stopwatch", "id": "stopwatch",
"name": "Stopwatch Touch", "name": "Stopwatch Touch",
"version": "0.01", "version": "0.02",
"description": "A touch based stop watch for Bangle JS 2", "description": "A touch based stop watch for Bangle JS 2",
"icon": "stopwatch.png", "icon": "stopwatch.png",
"screenshots": [{"url":"screenshot1.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"}], "screenshots": [{"url":"screenshot1.png"},{"url":"screenshot2.png"},{"url":"screenshot3.png"}],

18
apps/stopwatch/stopwatch.app.js
View File

@ -185,17 +185,27 @@ resetBtn.setImage(pause_img);
Bangle.on('touch', function(button, xy) { Bangle.on('touch', function(button, xy) {
var x = xy.x;
var y = xy.y;
// adjust for outside the dimension of the screen
// http://forum.espruino.com/conversations/371867/#comment16406025
if (y > h) y = h;
if (y < 0) y = 0;
if (x > w) x = w;
if (x < 0) x = 0;
// not running, and reset // not running, and reset
if (!running && tCurrent == tTotal && bigPlayPauseBtn.check(xy.x, xy.y)) return; if (!running && tCurrent == tTotal && bigPlayPauseBtn.check(x, y)) return;
// paused and hit play // paused and hit play
if (!running && tCurrent != tTotal && smallPlayPauseBtn.check(xy.x, xy.y)) return; if (!running && tCurrent != tTotal && smallPlayPauseBtn.check(x, y)) return;
// paused and press reset // paused and press reset
if (!running && tCurrent != tTotal && resetBtn.check(xy.x, xy.y)) return; if (!running && tCurrent != tTotal && resetBtn.check(x, y)) return;
// must be running // must be running
if (running && bigPlayPauseBtn.check(xy.x, xy.y)) return; if (running && bigPlayPauseBtn.check(x, y)) return;
}); });
// Stop updates when LCD is off, restart when on // Stop updates when LCD is off, restart when on