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

SliderInput: refactor to not use LCD overlay

pull/2953/head
thyttan 2023-08-21 23:52:00 +02:00
parent ffab963837
commit 604350e328
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/SliderInput.js
View File

@ -12,6 +12,9 @@ const STEPS = conf.steps || 30; //Default corresponds to my phones volume range,
const OVERSIZE_R = conf.oversizeR || 0; const OVERSIZE_R = conf.oversizeR || 0;
const OVERSIZE_L = conf.oversizeL || 0; const OVERSIZE_L = conf.oversizeL || 0;
const TIMEOUT = conf.timeout || 1; const TIMEOUT = conf.timeout || 1;
const COL_FG = conf.colorFG || g.theme.fg2;
const COL_BG = conf.colorBG || g.theme.bg2;
const LAZY = conf.lazy || true;
const STEP_SIZE = HEIGHT/STEPS; const STEP_SIZE = HEIGHT/STEPS;
@ -28,7 +31,9 @@ let dragSlider = e=>{
"ram"; "ram";
E.stopEventPropagation&&E.stopEventPropagation(); E.stopEventPropagation&&E.stopEventPropagation();
if (timeout) {clearTimeout(timeout); timeout = setTimeout(remove, 1000*TIMEOUT);} if (timeout) {clearTimeout(timeout); timeout = undefined;}
if (e.b==0 && !timeout) timeout = setTimeout(remove, 1000*TIMEOUT);
let input = Math.min(ROTATE?175-e.x:e.y, 170); let input = Math.min(ROTATE?175-e.x:e.y, 170);
input = Math.round(input/STEP_SIZE); input = Math.round(input/STEP_SIZE);
@ -61,8 +66,6 @@ let dragSlider = e=>{
ebLast = e.b; ebLast = e.b;
}; };
let ovr = Graphics.createArrayBuffer(ROTATE?HEIGHT+5:WIDTH+9, ROTATE?WIDTH+9:HEIGHT+5, 1, {msb:true});
let draw = (level)=>{ let draw = (level)=>{
"ram"; "ram";
// Draw the indicator. // Draw the indicator.
@ -71,33 +74,24 @@ let draw = (level)=>{
// If user drags directly on the draw area, adjust level one-to-one. // If user drags directly on the draw area, adjust level one-to-one.
// Pauses and resets the time out when interacted with. // Pauses and resets the time out when interacted with.
if (firstRun) { if (firstRun || !LAZY) {
ovr.setColor(1).setRotation(ROTATE). g.setColor(COL_FG).fillRect({x:X_START,y:Y_START,w:WIDTH+8,y2:Y_START+HEIGHT+5,r:0}); // To get outer border...
fillRect({x:0,y:0,w:WIDTH+9,y2:HEIGHT+5,r:0}); // To get outer border...
} }
if (level == prevLevel) {if (!firstRun) return; if (firstRun) firstRun = false;} if (level == prevLevel) {if (!firstRun) return; if (firstRun) firstRun = false;}
levelHeight = level==0?WIDTH:level*STEP_SIZE; // Math.max(level*STEP_SIZE,STEP_SIZE); levelHeight = level==0?WIDTH:level*STEP_SIZE; // Math.max(level*STEP_SIZE,STEP_SIZE);
prevLevel = level; prevLevel = level;
ovr.setColor(0).setRotation(ROTATE). g.setColor(COL_BG).
fillRect({x:2,y:2,w:WIDTH+4,y2:HEIGHT+2,r:0}). // ... and here it's made hollow. fillRect({x:X_START+2,y:Y_START+2,w:WIDTH+4,y2:Y_START+HEIGHT+2,r:0}). // ... and here it's made hollow.
setColor(0==level?0:1). setColor(0==level?COL_BG:COL_FG).
fillRect({x:4,y:4+HEIGHT-levelHeight,w:WIDTH,y2:HEIGHT,r:0}); // Here the bar is drawn. fillRect({x:X_START+4,y:Y_START+4+HEIGHT-levelHeight,w:WIDTH,y2:Y_START+HEIGHT,r:0}); // Here the bar is drawn.
Bangle.setLCDOverlay({
width:ROTATE?HEIGHT+5:WIDTH+9, height:ROTATE?WIDTH+9:HEIGHT+5,
bpp:1, transparent:0,
buffer:ovr.buffer
}, X_START, Y_START);
//print(level); //print(level);
//print(process.memory().usage); //print(process.memory().usage);
}; };
let remove = ()=> { let remove = ()=> {
ovr.clear().reset();
Bangle.setLCDOverlay();
Bangle.removeListener('drag', dragSlider); Bangle.removeListener('drag', dragSlider);
cb("remove", prevLevel); cb("remove", prevLevel);
}; };