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

Merge pull request #3855 from randyheydon/bwclklite_clkinfo 

bwclklite: Adjust clkinfo positions for long text.
master
thyttan 2025-05-18 22:23:43 +02:00 committed by GitHub
parent b5a15f6a23 ce8cf1d542
commit 03dd58515f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/bwclklite/ChangeLog
View File

@ -37,3 +37,4 @@ clkinfo.addInteractive that would cause ReferenceError.
0.33: Make the border of the clock_info box extend all the way to the right of the screen. 0.33: Make the border of the clock_info box extend all the way to the right of the screen.
0.34: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749) 0.34: Fix issue rendering ClockInfos with for fg+bg color set to the same (#2749)
0.35: Support 12-hour time format 0.35: Support 12-hour time format
0.36: Adjust clock info positions to better fit long text

24
apps/bwclklite/app.js
View File

@ -101,7 +101,7 @@ let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
let hideClkInfo = info.text == null; let hideClkInfo = info.text == null;
g.reset().setBgColor(g.theme.fg).clearRect(options.x, options.y, options.x+options.w, options.y+options.h); g.reset().setBgColor(g.theme.fg).clearRect(options.x, options.y, options.x+options.w, options.y+options.h);
g.setFontAlign(0,0).setColor(g.theme.bg); g.setFontAlign(-1,-1).setColor(g.theme.bg);
if (options.focus){ if (options.focus){
let y = hideClkInfo ? options.y+20 : options.y+2; let y = hideClkInfo ? options.y+20 : options.y+2;
@ -117,26 +117,36 @@ let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
return; return;
} }
// Set text and font // Set text and font, compute sizes.
let image = info.img; let image = info.img;
let imgWidth = image == null ? 0 : 24;
let imgWidthClear = parseInt(imgWidth*1.3);
let text = String(info.text); let text = String(info.text);
let strWidth;
if(text.split('\n').length > 1){ if(text.split('\n').length > 1){
g.setFont("6x8"); //g.setMiniFont(); g.setFont("6x8"); //g.setMiniFont();
strWidth = g.stringWidth(text);
} else { } else {
g.setFont("6x8:3"); //g.setSmallFont(); g.setFont("6x8:3"); //g.setSmallFont();
strWidth = g.stringWidth(text);
if (strWidth+imgWidthClear > options.w) {
g.setFont("6x8"); //g.setMiniFont();
text = g.wrapString(text, options.w-imgWidthClear).join("\n");
strWidth = g.stringWidth(text);
}
} }
// Compute sizes // Compute positions
let strWidth = g.stringWidth(text);
let imgWidth = image == null ? 0 : 24;
let midx = options.x+options.w/2; let midx = options.x+options.w/2;
let imgPosX = Math.max(midx-Math.floor(imgWidthClear/2)-parseInt(strWidth/2), 0);
let strPosX = imgPosX+imgWidthClear;
// Draw // Draw
if (image) { if (image) {
let scale = imgWidth / image.width; let scale = imgWidth / image.width;
g.drawImage(image, midx-parseInt(imgWidth*1.3/2)-parseInt(strWidth/2), options.y+6, {scale: scale}); g.drawImage(image, imgPosX, options.y+6, {scale: scale});
} }
g.drawString(text, midx+parseInt(imgWidth*1.3/2), options.y+20); g.drawString(text, strPosX, options.y+6);
// In case we are in focus and the focus box changes (fullscreen yes/no) // In case we are in focus and the focus box changes (fullscreen yes/no)
// we draw the time again. Otherwise it could happen that a while line is // we draw the time again. Otherwise it could happen that a while line is

2
apps/bwclklite/metadata.json
View File

@ -1,7 +1,7 @@
{ {
"id": "bwclklite", "id": "bwclklite",
"name": "BW Clock Lite", "name": "BW Clock Lite",
"version": "0.35", "version": "0.36",
"description": "A very minimalistic clock. This version of BW Clock is quicker at the cost of the custom font.", "description": "A very minimalistic clock. This version of BW Clock is quicker at the cost of the custom font.",
"readme": "README.md", "readme": "README.md",
"icon": "app.png", "icon": "app.png",