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

Move check for cachedSize into calcBoxSize

master
stweedo 2024-09-06 01:22:58 -05:00 committed by GitHub
parent 16a5650c41
commit 48e02ba13f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
apps/boxclk/app.js
View File

@ -85,9 +85,7 @@
boxKeys.forEach(key => { boxKeys.forEach(key => {
if (boxes[key].selected) { if (boxes[key].selected) {
let boxItem = boxes[key]; let boxItem = boxes[key];
if (!boxItem.cachedSize) { calcBoxSize(boxItem);
calcBoxSize(boxItem);
}
let newX = boxItem.pos.x + e.dx; let newX = boxItem.pos.x + e.dx;
let newY = boxItem.pos.y + e.dy; let newY = boxItem.pos.y + e.dy;
@ -320,17 +318,9 @@
g.setFont(boxItem.font, boxItem.fontSize); g.setFont(boxItem.font, boxItem.fontSize);
g.setFontAlign(0, 0); g.setFontAlign(0, 0);
// Use cached size if available, otherwise calculate and cache calcBoxSize(boxItem);
if (!boxItem.cachedSize) {
calcBoxSize(boxItem);
}
const pos = { const pos = calcBoxPos(boxItem);
x1: boxItem.pos.x - boxItem.cachedSize.width / 2,
y1: boxItem.pos.y - boxItem.cachedSize.height / 2,
x2: boxItem.pos.x + boxItem.cachedSize.width / 2,
y2: boxItem.pos.y + boxItem.cachedSize.height / 2
};
if (boxItem.selected) { if (boxItem.selected) {
g.setColor(boxItem.border); g.setColor(boxItem.border);
@ -353,31 +343,41 @@
}; };
// 9. Helper function for touch event // 9. Helper function for touch event
let calcBoxSize = function(boxItem) { let calcBoxPos = function(boxItem) {
g.setFont(boxItem.font, boxItem.fontSize); calcBoxSize(boxItem);
g.setFontAlign(0, 0); return {
let strWidth = g.stringWidth(boxItem.string) + 2 * boxItem.outline;
let fontHeight = g.getFontHeight() + 2 * boxItem.outline;
let totalWidth = strWidth + 2 * boxItem.xPadding;
let totalHeight = fontHeight + 2 * boxItem.yPadding;
boxItem.cachedSize = {
width: totalWidth,
height: totalHeight
};
};
let touchInText = function(e, boxItem, boxKey) {
if (!boxItem.cachedSize) {
calcBoxSize(boxItem);
}
const pos = {
x1: boxItem.pos.x - boxItem.cachedSize.width / 2, x1: boxItem.pos.x - boxItem.cachedSize.width / 2,
y1: boxItem.pos.y - boxItem.cachedSize.height / 2, y1: boxItem.pos.y - boxItem.cachedSize.height / 2,
x2: boxItem.pos.x + boxItem.cachedSize.width / 2, x2: boxItem.pos.x + boxItem.cachedSize.width / 2,
y2: boxItem.pos.y + boxItem.cachedSize.height / 2 y2: boxItem.pos.y + boxItem.cachedSize.height / 2
}; };
};
// Use cached size if available, otherwise calculate and cache
let calcBoxSize = function(boxItem) {
if (boxItem.cachedSize) {
return boxItem.cachedSize;
}
g.setFont(boxItem.font, boxItem.fontSize);
g.setFontAlign(0, 0);
let strWidth = g.stringWidth(boxItem.string) + 2 * boxItem.outline;
let fontHeight = g.getFontHeight() + 2 * boxItem.outline;
let totalWidth = strWidth + 2 * boxItem.xPadding;
let totalHeight = fontHeight + 2 * boxItem.yPadding;
boxItem.cachedSize = {
width: totalWidth,
height: totalHeight
};
return boxItem.cachedSize;
};
let touchInText = function(e, boxItem, boxKey) {
calcBoxSize(boxItem);
const pos = calcBoxPos(boxItem);
return e.x >= pos.x1 && return e.x >= pos.x1 &&
e.x <= pos.x2 && e.x <= pos.x2 &&
e.y >= pos.y1 && e.y >= pos.y1 &&