FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Revert changes to timerclk

pull/3274/head
Anton 2024-03-17 12:13:54 +01:00
parent adb7e8a924
commit 7328cfa1a7
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/lint_exemptions.js
View File

@ -183,7 +183,7 @@ module.exports = {
]
},
"timerclk/timer.js": {
"hash": "f44702e61ad833b53fb28d222ff0fbd77d0307c6eb69c5ecebb8626a1cb20ed4",
"hash": "3b70606f1742b34bf4769f6e8703144ff0c3ba401a3a21f97ddcab5432c94db5",
"rules": [
"no-unused-vars",
"no-undef"
@ -197,7 +197,7 @@ module.exports = {
]
},
"timerclk/alarm.js": {
"hash": "6f521742cc6a6d6f215e499084a596ffc3494d1e1f950b204368c051a18773de",
"hash": "3c280b0858d43f10b12947e5ae939c6825a620e6cb3687c6a7549c1a000b6241",
"rules": [
"no-unused-vars",
"no-undef"

1
apps/timerclk/ChangeLog
View File

@ -4,3 +4,4 @@
0.04: Use 'modules/suncalc.js' to avoid it being copied 8 times for different apps
0.05: Improve responsiveness and detection of swipes on main clock screen
0.06: Minor code improvements
0.07: Fix regression in 0.06

6
apps/timerclk/alarm.js
View File

@ -18,7 +18,7 @@ var editIndex = 0;
var drawInterval;
var drawIntervalTimeout;
var buttons;
//var dragBorderHrsMins=0, dragBorderMinsSecs=0;
var dragBorderHrsMins=0, dragBorderMinsSecs=0;
function update() {
if (drawInterval) clearInterval(drawInterval);
@ -103,8 +103,8 @@ function draw() {
else if (editIndex == 1) x = start + g.stringMetrics(timeStr[0]+":"+timeStr[1]+":"+timeStr[2]).width - markerPosChange;
else x = 0;
if (x) g.drawString("__", x, y);
//dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
//dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
}
if (all.length == 0) {

2
apps/timerclk/metadata.json
View File

@ -2,7 +2,7 @@
"id": "timerclk",
"name": "Timer Clock",
"shortName":"Timer Clock",
"version": "0.06",
"version": "0.07",
"description": "A clock with stopwatches, timers and alarms build in.",
"icon": "app-icon.png",
"type": "clock",

6
apps/timerclk/timer.js
View File

@ -18,7 +18,7 @@ var editIndex = 0;
var drawInterval;
var drawIntervalTimeout;
var buttons;
//var dragBorderHrsMins=0, dragBorderMinsSecs=0;
var dragBorderHrsMins=0, dragBorderMinsSecs=0;
function update() {
if (drawInterval) clearInterval(drawInterval);
@ -128,8 +128,8 @@ function draw() {
else if (editIndex == 1) x = start + g.stringMetrics(timeStr[0]+":"+timeStr[1]+":"+timeStr[2]).width - markerPosChange;
else x = 0;
if (x) g.drawString("__", x, y);
//dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
//dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
dragBorderHrsMins = start+g.stringMetrics(timeStr[0]).width+g.stringMetrics(":").width/2;
dragBorderMinsSecs = start+g.stringMetrics(timeStr[0]+":"+timeStr[1]).width+g.stringMetrics(":").width/2;
}
if (all.length == 0) {