bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

promenu: rename settings (avoid clobbering short variables) 

... since `S` is used a lot in the IDE
master
Rob Pilling 2025-04-25 17:24:58 +01:00
parent 0e06ccffda
commit f1c03e4e72
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/promenu/bootb2.js
View File

@ -1,7 +1,7 @@
var _a, _b; var _a, _b;
var S = (require("Storage").readJSON("promenu.settings.json", true) || {}); var prosettings = (require("Storage").readJSON("promenu.settings.json", true) || {});
(_a = S.naturalScroll) !== null && _a !== void 0 ? _a : (S.naturalScroll = false); (_a = prosettings.naturalScroll) !== null && _a !== void 0 ? _a : (prosettings.naturalScroll = false);
(_b = S.wrapAround) !== null && _b !== void 0 ? _b : (S.wrapAround = true); (_b = prosettings.wrapAround) !== null && _b !== void 0 ? _b : (prosettings.wrapAround = true);
E.showMenu = function (items) { E.showMenu = function (items) {
var RectRnd = function (x1, y1, x2, y2, r) { var RectRnd = function (x1, y1, x2, y2, r) {
var pp = []; var pp = [];
@ -168,7 +168,7 @@ E.showMenu = function (items) {
} }
else { else {
var lastSelected = selected; var lastSelected = selected;
if (S.wrapAround) { if (prosettings.wrapAround) {
selected = (selected + dir + menuItems.length) % menuItems.length; selected = (selected + dir + menuItems.length) % menuItems.length;
} }
else { else {
@ -210,7 +210,7 @@ E.showMenu = function (items) {
}, },
}, function (dir) { }, function (dir) {
if (dir) if (dir)
l.move(S.naturalScroll ? -dir : dir); l.move(prosettings.naturalScroll ? -dir : dir);
else else
l.select(); l.select();
}); });

10
apps/promenu/bootb2.ts
View File

@ -9,9 +9,9 @@ const enum Consts {
NAME_SCROLL_PAD = 5, NAME_SCROLL_PAD = 5,
} }
const S = (require("Storage").readJSON("promenu.settings.json", true) || {}) as PromenuSettings; const prosettings = (require("Storage").readJSON("promenu.settings.json", true) || {}) as PromenuSettings;
S.naturalScroll ??= false; prosettings.naturalScroll ??= false;
S.wrapAround ??= true; prosettings.wrapAround ??= true;
E.showMenu = (items?: Menu): MenuInstance => { E.showMenu = (items?: Menu): MenuInstance => {
const RectRnd = (x1: number, y1: number, x2: number, y2: number, r: number) => { const RectRnd = (x1: number, y1: number, x2: number, y2: number, r: number) => {
@ -216,7 +216,7 @@ E.showMenu = (items?: Menu): MenuInstance => {
} else { } else {
const lastSelected = selected; const lastSelected = selected;
if (S.wrapAround) { if (prosettings.wrapAround) {
selected = (selected + dir + /*keep +ve*/menuItems.length) % menuItems.length; selected = (selected + dir + /*keep +ve*/menuItems.length) % menuItems.length;
} else { } else {
selected = E.clip(selected + dir, 0, menuItems.length - 1); selected = E.clip(selected + dir, 0, menuItems.length - 1);
@ -257,7 +257,7 @@ E.showMenu = (items?: Menu): MenuInstance => {
}, },
} as SetUIArg<"updown">, } as SetUIArg<"updown">,
dir => { dir => {
if (dir) l.move(S.naturalScroll ? -dir : dir); if (dir) l.move(prosettings.naturalScroll ? -dir : dir);
else l.select(); else l.select();
}); });