iarv/Meck
1
0
Fork 1
mirror of https://github.com/pelgraine/Meck.git synced 2026-05-18 07:15:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

tiny text view testing

Browse Source
This commit is contained in:
pelgraine
2026-02-07 16:35:02 +11:00
parent af9f41a541
commit 6f23cd612c
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/main.cpp
+11 -5
View File
@@ -573,7 +573,7 @@ void handleKeyboardInput() {
void drawComposeScreen() {
#ifdef DISPLAY_CLASS
display.startFrame();
display.setTextSize(1);
display.setTextSize(1); // Header stays normal size
display.setColor(DisplayDriver::GREEN);
display.setCursor(0, 0);
@@ -590,16 +590,19 @@ void drawComposeScreen() {
display.setColor(DisplayDriver::LIGHT);
display.drawRect(0, 11, display.width(), 1);
// Switch to tiny font for compose body
display.setTextSize(0);
display.setCursor(0, 14);
display.setColor(DisplayDriver::LIGHT);
// Word wrap the compose buffer - calculate chars per line based on actual font width
int x = 0;
int y = 14;
int lineHeight = 9; // 8px font + 1px spacing
uint16_t testWidth = display.getTextWidth("MMMMMMMMMM"); // 10 wide chars
int charsPerLine = (testWidth > 0) ? (display.width() * 10) / testWidth : 20;
if (charsPerLine < 12) charsPerLine = 12;
if (charsPerLine > 40) charsPerLine = 40;
int charsPerLine = (testWidth > 0) ? (display.width() * 10) / testWidth : 35;
if (charsPerLine < 20) charsPerLine = 20;
if (charsPerLine > 60) charsPerLine = 60;
char charStr[2] = {0, 0}; // Buffer for single character as string
for (int i = 0; i < composePos; i++) {
@@ -608,7 +611,7 @@ void drawComposeScreen() {
x++;
if (x >= charsPerLine) {
x = 0;
y += 11;
y += lineHeight;
display.setCursor(0, y);
}
}
@@ -616,6 +619,9 @@ void drawComposeScreen() {
// Show cursor
display.print("_");
// Switch back to normal font for status bar
display.setTextSize(1);
// Status bar
int statusY = display.height() - 12;
display.setColor(DisplayDriver::LIGHT);
examples/companion_radio/ui-new/ChannelScreen.h
+15 -11
View File
@@ -114,24 +114,26 @@ public:
display.drawRect(0, 11, display.width(), 1);
if (channelMsgCount == 0) {
display.setCursor(0, 25);
display.setTextSize(0); // Tiny font for body text
display.setCursor(0, 20);
display.setColor(DisplayDriver::LIGHT);
display.print("No messages yet");
display.setCursor(0, 40);
display.setCursor(0, 30);
display.print("A/D: Switch channel");
display.setCursor(0, 52);
display.setCursor(0, 40);
display.print("C: Compose message");
display.setTextSize(1); // Restore for footer
} else {
int lineHeight = 10;
display.setTextSize(0); // Tiny font for message body
int lineHeight = 9; // 8px font + 1px spacing
int headerHeight = 14;
int footerHeight = 14;
// Calculate chars per line based on actual font width (not assumed 6px)
// Measure a test string and scale accordingly
// Calculate chars per line based on actual font width
uint16_t testWidth = display.getTextWidth("MMMMMMMMMM"); // 10 wide chars
int charsPerLine = (testWidth > 0) ? (display.width() * 10) / testWidth : 20;
if (charsPerLine < 12) charsPerLine = 12; // Minimum reasonable
if (charsPerLine > 40) charsPerLine = 40; // Maximum reasonable
int charsPerLine = (testWidth > 0) ? (display.width() * 10) / testWidth : 35;
if (charsPerLine < 20) charsPerLine = 20; // Minimum reasonable
if (charsPerLine > 60) charsPerLine = 60; // Maximum reasonable
int y = headerHeight;
@@ -172,13 +174,13 @@ public:
display.print(tmp);
y += lineHeight;
// Message text with character wrapping (like compose screen - fills full width)
// Message text with character wrapping
display.setColor(DisplayDriver::LIGHT);
int textLen = strlen(msg->text);
int pos = 0;
int linesForThisMsg = 0;
int maxLinesPerMsg = 6; // Allow more lines per message
int maxLinesPerMsg = 8; // More lines now that font is smaller
int x = 0;
char charStr[2] = {0, 0};
@@ -209,6 +211,8 @@ public:
msgsDrawn++;
_msgsPerPage = msgsDrawn;
}
display.setTextSize(1); // Restore for footer
}
// Footer with controls