mirror of
https://github.com/correl/m5paper.git
synced 2024-11-24 03:00:10 +00:00
Add pagination to the text app
This commit is contained in:
parent
52d13bb40b
commit
980d830e94
1 changed files with 58 additions and 33 deletions
89
src/main.cpp
89
src/main.cpp
|
|
@ -276,37 +276,62 @@ public:
|
||||||
class Text: public App {
|
class Text: public App {
|
||||||
public:
|
public:
|
||||||
Text() {
|
Text() {
|
||||||
String sample =
|
|
||||||
"I've seen things you people wouldn't believe.\n"
|
|
||||||
"Attack ships on fire off the shoulder of Orion.\n"
|
|
||||||
"I watched c-beams glitter in the dark near the Tannhäuser Gate.\n"
|
|
||||||
"All those moments will be lost in time, like tears in rain.\n"
|
|
||||||
"Time to die.";
|
|
||||||
M5.Display.startWrite();
|
M5.Display.startWrite();
|
||||||
M5.Display.setEpdMode(epd_quality);
|
M5.Display.setEpdMode(epd_quality);
|
||||||
M5.Display.setRotation(0);
|
M5.Display.setRotation(0);
|
||||||
M5.Display.clearDisplay(TFT_WHITE);
|
M5.Display.clearDisplay(TFT_WHITE);
|
||||||
M5.Display.setFont(&fonts::FreeSans9pt7b);
|
textArea = new M5Canvas(&M5.Display);
|
||||||
M5.Display.setTextSize(2);
|
textArea->createSprite(M5.Display.width() - 50, M5.Display.height() - 50);
|
||||||
M5.Display.setCursor(0, 0);
|
textArea->setFont(&fonts::DejaVu40);
|
||||||
printPage(M5.Display, sample);
|
textArea->setTextSize(1);
|
||||||
|
textArea->setTextColor(TFT_BLACK);
|
||||||
|
pages[0] = 0;
|
||||||
|
pages[currentPage + 1] = printPage(textArea, sample);
|
||||||
|
textArea->pushSprite(25, 25);
|
||||||
M5.Display.endWrite();
|
M5.Display.endWrite();
|
||||||
}
|
}
|
||||||
App::Choices loop() {
|
App::Choices loop() {
|
||||||
|
if (M5.BtnA.wasClicked() && currentPage > 0) {
|
||||||
|
currentPage -= 1;
|
||||||
|
printPage(textArea, sample, pages[currentPage]);
|
||||||
|
textArea->pushSprite(25, 25);
|
||||||
|
} else if (M5.BtnC.wasClicked() && pages[currentPage + 1] >= 0) {
|
||||||
|
currentPage += 1;
|
||||||
|
pages[currentPage + 1] = printPage(textArea, sample, pages[currentPage]);
|
||||||
|
textArea->pushSprite(25, 25);
|
||||||
|
}
|
||||||
return App::Text;
|
return App::Text;
|
||||||
}
|
}
|
||||||
void shutdown() {
|
void shutdown() {
|
||||||
|
|
||||||
}
|
}
|
||||||
protected:
|
protected:
|
||||||
bool endOfPage(M5GFX display) {
|
M5Canvas* textArea;
|
||||||
return display.getCursorY() + display.fontHeight() > display.height();
|
int pages[100];
|
||||||
|
int currentPage = 0;
|
||||||
|
String sample =
|
||||||
|
"Here is what to do if you want to get a lift from a Vogon: forget it. "
|
||||||
|
"They are one of the most unpleasant races in the Galaxy.\n\n"
|
||||||
|
"Not actually evil, but bad-tempered, bureaucratic, officious and callous. "
|
||||||
|
"They wouldn't even lift a finger to save their own grandmothers from the Ravenous "
|
||||||
|
"Bugblatter Beast of Traal without orders - signed in triplicate, sent in, sent back, "
|
||||||
|
"queried, lost, found, subjected to public inquiry, lost again, and finally buried in "
|
||||||
|
"soft peat for three months and recycled as firelighters.\n\n"
|
||||||
|
"The best way to get a drink out of a Vogon is to stick your finger down his throat, "
|
||||||
|
"and the best way to irritate him is to feed his grandmother to the Ravenous Bugblatter "
|
||||||
|
"Beast of Traal.\n\n"
|
||||||
|
"On no account should you allow a Vogon to read poetry at you.";
|
||||||
|
|
||||||
|
bool endOfPage(lgfx::LovyanGFX* display) {
|
||||||
|
return display->getCursorY() + display->fontHeight() > display->height();
|
||||||
}
|
}
|
||||||
|
|
||||||
int printPage(M5GFX display, String s, int index = 0) {
|
int printPage(lgfx::LovyanGFX* display, String s, int index = 0) {
|
||||||
int next = index;
|
int next = index;
|
||||||
bool in_whitespace = false;
|
bool in_whitespace = false;
|
||||||
display.setTextWrap(false, false);
|
display->setTextWrap(false, false);
|
||||||
|
display->fillScreen(TFT_WHITE);
|
||||||
|
display->setCursor(0, 0);
|
||||||
|
|
||||||
for (int i = index; i < s.length(); i++) {
|
for (int i = index; i < s.length(); i++) {
|
||||||
if (endOfPage(display)) {
|
if (endOfPage(display)) {
|
||||||
|
|
@ -315,37 +340,36 @@ protected:
|
||||||
if (s.charAt(i) == '\n') {
|
if (s.charAt(i) == '\n') {
|
||||||
if (! in_whitespace) {
|
if (! in_whitespace) {
|
||||||
String word = s.substring(next, i);
|
String word = s.substring(next, i);
|
||||||
if (display.textWidth(word) + display.getCursorX() > display.width()) {
|
if (display->textWidth(word) + display->getCursorX() > display->width()) {
|
||||||
display.print("\n");
|
display->print("\n");
|
||||||
if (endOfPage(display)) {
|
if (endOfPage(display)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
word.trim();
|
word.trim();
|
||||||
display.print(word);
|
display->print(word);
|
||||||
next = i;
|
next = i;
|
||||||
} else {
|
} else {
|
||||||
display.print(word);
|
display->print(word);
|
||||||
next = i;
|
next = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
in_whitespace = true;
|
in_whitespace = true;
|
||||||
display.print("\n");
|
|
||||||
if (endOfPage(display)) {
|
if (endOfPage(display)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if (s.charAt(i) == ' ') {
|
} else if (s.charAt(i) == ' ') {
|
||||||
if (! in_whitespace) {
|
if (! in_whitespace) {
|
||||||
String word = s.substring(next, i);
|
String word = s.substring(next, i);
|
||||||
if (display.textWidth(word) + display.getCursorX() > display.width()) {
|
if (display->textWidth(word) + display->getCursorX() > display->width()) {
|
||||||
display.print("\n");
|
display->print("\n");
|
||||||
if (endOfPage(display)) {
|
if (endOfPage(display)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
word.trim();
|
word.trim();
|
||||||
display.print(word);
|
display->print(word);
|
||||||
next = i;
|
next = i;
|
||||||
} else {
|
} else {
|
||||||
display.print(word);
|
display->print(word);
|
||||||
next = i;
|
next = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -355,24 +379,29 @@ protected:
|
||||||
// End of the input, print it if we can.
|
// End of the input, print it if we can.
|
||||||
|
|
||||||
String word = s.substring(next);
|
String word = s.substring(next);
|
||||||
if (display.textWidth(word) + display.getCursorX() > display.width()) {
|
if (display->textWidth(word) + display->getCursorX() > display->width()) {
|
||||||
display.print("\n");
|
display->print("\n");
|
||||||
if (endOfPage(display)) {
|
if (endOfPage(display)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
word.trim();
|
word.trim();
|
||||||
display.print(word);
|
display->print(word);
|
||||||
next = i;
|
next = i;
|
||||||
} else {
|
} else {
|
||||||
display.print(word);
|
display->print(word);
|
||||||
next = i;
|
next = i;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
in_whitespace = false;
|
in_whitespace = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
next += 1;
|
||||||
|
if (next >= s.length()) {
|
||||||
|
return -1;
|
||||||
|
} else {
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class LifeTracker: public App {
|
class LifeTracker: public App {
|
||||||
|
|
@ -679,12 +708,8 @@ void loop()
|
||||||
M5.update();
|
M5.update();
|
||||||
|
|
||||||
App::Choices next = current_app;
|
App::Choices next = current_app;
|
||||||
if (M5.BtnA.wasClicked()) {
|
if (M5.BtnB.wasClicked()) {
|
||||||
next = App::Clock;
|
|
||||||
} else if (M5.BtnB.wasClicked()) {
|
|
||||||
next = App::System;
|
next = App::System;
|
||||||
} else if (M5.BtnC.wasClicked()) {
|
|
||||||
next = App::Text;
|
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (next != current_app) {
|
if (next != current_app) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue