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

Slider:move laziness from draw fun to drag handler

pull/2953/head
thyttan 2023-09-29 02:22:39 +02:00
parent 8c4ad72d1d
commit 5657492cb4
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/Slider.js
View File

@ -107,9 +107,11 @@ try { // for making it possiblie to run the test app in the following catch stat
o.v.level = Math.min(Math.max(input,0),o.c.steps); o.v.level = Math.min(Math.max(input,0),o.c.steps);
if (o.v.level != o.v.prevLevel) cb("map",o.v.level); if (o.v.level != o.v.prevLevel) {
cb("map",o.v.level);
o.f.draw&&o.f.draw(o.v.level); o.f.draw&&o.f.draw(o.v.level);
}
o.v.prevLevel = o.v.level;
} else if (o.c.useIncr) { // Heavily inspired by "updown" mode of setUI. } else if (o.c.useIncr) { // Heavily inspired by "updown" mode of setUI.
o.v.dy += o.c.horizontal?-e.dx:e.dy; o.v.dy += o.c.horizontal?-e.dx:e.dy;
@ -124,6 +126,7 @@ try { // for making it possiblie to run the test app in the following catch stat
o.v.level = Math.min(Math.max(o.v.level-incr,0),o.c.steps); o.v.level = Math.min(Math.max(o.v.level-incr,0),o.c.steps);
cb("incr",incr); cb("incr",incr);
o.f.draw&&o.f.draw(o.v.level); o.f.draw&&o.f.draw(o.v.level);
o.v.prevLevel = o.v.level;
} }
} }
o.v.ebLast = e.b; o.v.ebLast = e.b;
@ -134,7 +137,7 @@ try { // for making it possiblie to run the test app in the following catch stat
Bangle.removeListener('drag', o.f.dragSlider); Bangle.removeListener('drag', o.f.dragSlider);
o.v.dragActive = false; o.v.dragActive = false;
o.v.timeoutID = undefined; o.v.timeoutID = undefined;
cb("remove", o.v.prevLevel); cb("remove", o.v.level);
}; };
} }
@ -153,17 +156,9 @@ try { // for making it possiblie to run the test app in the following catch stat
o.f.draw = (level)=>{ o.f.draw = (level)=>{
"ram"; "ram";
if (true || o.v.firstRun || !o.c.lazy) { g.setColor(o.c.colorFG).fillRect(o.c.borderRect). // To get outer border...
g.setColor(o.c.colorFG).fillRect(o.c.borderRect); // To get outer border... setColor(o.c.colorBG).fillRect(o.c.hollowRect). // ... and here it's made hollow.
} setColor(0==level?o.c.colorBG:o.c.colorFG).fillRect(o.f.updateBar((!o.c.rounded?0:(2*o.c.rounded-7))+level*o.c.STEP_SIZE)); // Here the bar is drawn.
if (false && level == o.v.prevLevel) {if (!o.v.firstRun) return; if (o.v.firstRun) o.v.firstRun = false;}
o.v.prevLevel = level;
g.setColor(o.c.colorBG).
fillRect(o.c.hollowRect). // ... and here it's made hollow.
setColor(0==level?o.c.colorBG:o.c.colorFG).
fillRect(o.f.updateBar((!o.c.rounded?0:(2*o.c.rounded-7))+level*o.c.STEP_SIZE)); // Here the bar is drawn.
if (o.c.rounded && level===0) { if (o.c.rounded && level===0) {
g.setColor(o.c.colorFG).fillCircle(o.c._xStart+(!o.c.horizontal?o.c._width/2:o.c.rounded-2), o.c._yStart+o.c._height-o.c.rounded+2, o.c.rounded-o.c.innerBorderSize); g.setColor(o.c.colorFG).fillCircle(o.c._xStart+(!o.c.horizontal?o.c._width/2:o.c.rounded-2), o.c._yStart+o.c._height-o.c.rounded+2, o.c.rounded-o.c.innerBorderSize);
g.setColor(o.c.colorBG).fillCircle(o.c._xStart+(!o.c.horizontal?o.c._width/2:o.c.rounded-2), o.c._yStart+o.c._height-o.c.rounded+2, o.c.rounded-o.c.innerBorderSize-2); g.setColor(o.c.colorBG).fillCircle(o.c._xStart+(!o.c.horizontal?o.c._width/2:o.c.rounded-2), o.c._yStart+o.c._height-o.c.rounded+2, o.c.rounded-o.c.innerBorderSize-2);