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

Slider: refactor useIncr/Map -> mode:"incr"/"map"/ 

/"mapincr"

Thanks @bobrippling
master
thyttan 2023-10-10 23:47:16 +02:00
parent 3afd9ac126
commit 9b882c24bd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/Slider.js
View File

@ -23,8 +23,7 @@ try { // For making it possiblie to run the test app in the following catch stat
dragableSlider:true, dragableSlider:true,
dragRect:R, dragRect:R,
useIncr:true, mode:"incr",
useMap:false,
oversizeR:0, oversizeR:0,
oversizeL:0, oversizeL:0,
propagateDrag:false, propagateDrag:false,
@ -93,6 +92,9 @@ try { // For making it possiblie to run the test app in the following catch stat
eyFirst = o.c.horizontal?e.x:e.y; eyFirst = o.c.horizontal?e.x:e.y;
} }
let useMap = (o.c.mode==="map"||o.c.mode==="mapincr")?true:false;
let useIncr = (o.c.mode==="incr"||o.c.mode==="mapincr")?true:false;
// Only react if on allowed area. // Only react if on allowed area.
if (o.f.wasOnDragRect(exFirst, eyFirst)) { if (o.f.wasOnDragRect(exFirst, eyFirst)) {
o.v.dragActive = true; o.v.dragActive = true;
@ -101,7 +103,7 @@ try { // For making it possiblie to run the test app in the following catch stat
if (o.v.timeoutID) {clearTimeout(o.v.timeoutID); o.v.timeoutID = undefined;} if (o.v.timeoutID) {clearTimeout(o.v.timeoutID); o.v.timeoutID = undefined;}
if (e.b==0 && !o.v.timeoutID && (o.c.timeout || o.c.timeout===0)) o.v.timeoutID = setTimeout(o.f.remove, 1000*o.c.timeout); if (e.b==0 && !o.v.timeoutID && (o.c.timeout || o.c.timeout===0)) o.v.timeoutID = setTimeout(o.f.remove, 1000*o.c.timeout);
if (o.c.useMap && o.f.wasOnIndicator(exFirst)) { // If draging starts on the indicator, adjust one-to-one. if (useMap && o.f.wasOnIndicator(exFirst)) { // If draging starts on the indicator, adjust one-to-one.
let input = !o.c.horizontal? let input = !o.c.horizontal?
Math.min((Y_MAX-e.y)-o.c.yStart-3*o.c.rounded/4, o.c.height): Math.min((Y_MAX-e.y)-o.c.yStart-3*o.c.rounded/4, o.c.height):
@ -112,7 +114,7 @@ try { // For making it possiblie to run the test app in the following catch stat
o.v.cbObj = {mode:"map", value:o.v.level}; o.v.cbObj = {mode:"map", value:o.v.level};
} else if (o.c.useIncr) { // Heavily inspired by "updown" mode of setUI. } else if (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;
//if (!e.b) o.v.dy=0; //if (!e.b) o.v.dy=0;