mirror of
https://github.com/mikecarper/MeshCore.git
synced 2026-09-16 19:22:54 +00:00
Add spacing to reader button hints
This commit is contained in:
@@ -32,7 +32,7 @@ Readers without the button hint retain the y=14 origin and y=22 message text.
|
||||
|
||||
On V4 and other single-button builds using this reader, the home screen says
|
||||
`hold button: inbox`. Hold the user button for about 1.2 seconds to open it.
|
||||
The bottom of the reader shows `<- 2tap 1tap -> long press:exit`: double tap
|
||||
The bottom of the reader shows `<- 2 tap 1 tap -> long press: exit`: double tap
|
||||
the button for the previous message, tap once for the next, and hold to
|
||||
return home. Advancing past the last message also returns home. The hint
|
||||
appears even when the inbox is empty and reflows onto additional lines on
|
||||
|
||||
@@ -17,21 +17,21 @@ struct ButtonReaderHintLayout {
|
||||
inline ButtonReaderHintLayout makeButtonReaderHintLayout(
|
||||
DisplayDriver& text, int line_height, int bottom) {
|
||||
ButtonReaderHintLayout layout = {
|
||||
0, line_height, 1, {"<- 2tap 1tap -> long press:exit", nullptr, nullptr}};
|
||||
0, line_height, 1, {"<- 2 tap 1 tap -> long press: exit", nullptr, nullptr}};
|
||||
if (text.getTextWidth(layout.lines[0]) > text.width()
|
||||
&& text.getTextWidth("<-2tap 1tap-> hold:exit") <= text.width()) {
|
||||
layout.lines[0] = "<-2tap 1tap-> hold:exit";
|
||||
&& text.getTextWidth("<-2 tap 1 tap-> hold: exit") <= text.width()) {
|
||||
layout.lines[0] = "<-2 tap 1 tap-> hold: exit";
|
||||
}
|
||||
if (text.getTextWidth(layout.lines[0]) > text.width()) {
|
||||
layout.line_count = 2;
|
||||
layout.lines[0] = "<- 2tap 1tap ->";
|
||||
layout.lines[1] = "long press:exit";
|
||||
layout.lines[0] = "<- 2 tap 1 tap ->";
|
||||
layout.lines[1] = "long press: exit";
|
||||
if (text.getTextWidth(layout.lines[0]) > text.width()
|
||||
|| text.getTextWidth(layout.lines[1]) > text.width()) {
|
||||
layout.line_count = 3;
|
||||
layout.lines[0] = "<- 2tap";
|
||||
layout.lines[1] = "1tap ->";
|
||||
layout.lines[2] = "hold:exit";
|
||||
layout.lines[0] = "<- 2 tap";
|
||||
layout.lines[1] = "1 tap ->";
|
||||
layout.lines[2] = "hold: exit";
|
||||
}
|
||||
}
|
||||
layout.top = bottom - layout.line_count * line_height;
|
||||
|
||||
@@ -28,7 +28,7 @@ reader from the radio-settings page:
|
||||
while opening or closing the reader.
|
||||
|
||||
The header shows the reference and part count. Single-button builds show
|
||||
`<- 2tap 1tap -> long press:exit` at the bottom, matching the message reader.
|
||||
`<- 2 tap 1 tap -> long press: exit` at the bottom, matching the message reader.
|
||||
These are taps of the user button. Narrower displays shorten or split the
|
||||
hint across lines; touch/joystick builds keep their own controls. The entry
|
||||
gesture stays hidden on the radio page. The footer has reserved space in the
|
||||
|
||||
Reference in New Issue
Block a user