pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 14:12:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Offset Header for Node list screens

Browse Source
This commit is contained in:
HarukiToreda 2025-04-02 03:32:13 -04:00
parent 2f8a1dba8f
commit 22b44ce7e6
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/graphics/Screen.cpp
View File

@ -1710,8 +1710,12 @@ String getSafeNodeName(meshtastic_NodeInfoLite *node)
// Draws the top header bar (optionally inverted or bold) // Draws the top header bar (optionally inverted or bold)
void drawScreenHeader(OLEDDisplay *display, const char *title, int16_t x, int16_t y) void drawScreenHeader(OLEDDisplay *display, const char *title, int16_t x, int16_t y)
{ {
bool isInverted = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED); constexpr int HEADER_OFFSET_Y = 2;
bool isBold = config.display.heading_bold; y += HEADER_OFFSET_Y;
const bool isInverted = (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED);
const bool isBold = config.display.heading_bold;
const int highlightHeight = FONT_HEIGHT_SMALL - 1;
display->setFont(FONT_SMALL); display->setFont(FONT_SMALL);
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
@ -1720,18 +1724,15 @@ void drawScreenHeader(OLEDDisplay *display, const char *title, int16_t x, int16_
int textWidth = display->getStringWidth(title); int textWidth = display->getStringWidth(title);
int titleX = (screenWidth - textWidth) / 2; int titleX = (screenWidth - textWidth) / 2;
// Height of highlight row // === Background highlight ===
const int highlightHeight = FONT_HEIGHT_SMALL - 1;
// Y offset to vertically center text in rounded bar
int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
if (isInverted) { if (isInverted) {
drawRoundedHighlight(display, 0, y, screenWidth, highlightHeight, 2); drawRoundedHighlight(display, 0, y, screenWidth, highlightHeight, 2);
display->setColor(BLACK); display->setColor(BLACK);
} }
// Draw text centered vertically and horizontally // === Text baseline ===
int textY = y + (highlightHeight - FONT_HEIGHT_SMALL) / 2;
display->drawString(titleX, textY, title); display->drawString(titleX, textY, title);
if (isBold) if (isBold)
display->drawString(titleX + 1, textY, title); display->drawString(titleX + 1, textY, title);
@ -1835,25 +1836,26 @@ typedef void (*EntryRenderer)(OLEDDisplay *, meshtastic_NodeInfoLite *, int16_t,
void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *title, void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *title,
EntryRenderer renderer) EntryRenderer renderer)
{ {
constexpr int headerOffsetY = 1;
int columnWidth = display->getWidth() / 2; int columnWidth = display->getWidth() / 2;
int totalRowsAvailable = (display->getHeight() - y - FONT_HEIGHT_SMALL) / (FONT_HEIGHT_SMALL - 3);
int visibleNodeRows = std::min(6, totalRowsAvailable);
int rowYOffset = FONT_HEIGHT_SMALL - 3; int rowYOffset = FONT_HEIGHT_SMALL - 3;
display->clear(); display->clear();
drawScreenHeader(display, title, x, y); drawScreenHeader(display, title, x, y);
y += headerOffsetY;
std::vector<NodeEntry> nodeList; std::vector<NodeEntry> nodeList;
retrieveAndSortNodes(nodeList); retrieveAndSortNodes(nodeList);
int totalEntries = nodeList.size(); int totalEntries = nodeList.size();
int maxScroll = calculateMaxScroll(totalEntries, visibleNodeRows); int totalRowsAvailable = (display->getHeight() - y - FONT_HEIGHT_SMALL) / (FONT_HEIGHT_SMALL - 3);
scrollIndex = std::min(scrollIndex, maxScroll); int visibleNodeRows = std::min(6, totalRowsAvailable);
int startIndex = scrollIndex * visibleNodeRows * 2; int startIndex = scrollIndex * visibleNodeRows * 2;
int endIndex = std::min(startIndex + visibleNodeRows * 2, totalEntries); int endIndex = std::min(startIndex + visibleNodeRows * 2, totalEntries);
int yOffset = rowYOffset; int yOffset = rowYOffset + headerOffsetY;
int col = 0; int col = 0;
int lastNodeY = y; int lastNodeY = y;
int shownCount = 0; int shownCount = 0;
@ -1867,17 +1869,18 @@ void drawNodeListScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t
shownCount++; shownCount++;
if (y + yOffset > display->getHeight() - FONT_HEIGHT_SMALL) { if (y + yOffset > display->getHeight() - FONT_HEIGHT_SMALL) {
yOffset = rowYOffset; yOffset = rowYOffset + headerOffsetY;
col++; col++;
if (col > 1) if (col > 1)
break; break;
} }
} }
drawColumnSeparator(display, x, y + FONT_HEIGHT_SMALL - 2, lastNodeY); drawColumnSeparator(display, x, y + FONT_HEIGHT_SMALL, lastNodeY + headerOffsetY);
drawScrollbar(display, visibleNodeRows, totalEntries, scrollIndex, 2, rowYOffset); drawScrollbar(display, visibleNodeRows, totalEntries, scrollIndex, 2, rowYOffset);
} }
// Public screen function: shows how recently nodes were heard // Public screen function: shows how recently nodes were heard
static void drawLastHeardScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) static void drawLastHeardScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {
@ -1945,20 +1948,21 @@ void drawCompassArrow(OLEDDisplay *display, meshtastic_NodeInfoLite *node, int16
void drawNodeListWithExtrasScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *title, void drawNodeListWithExtrasScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *title,
EntryRenderer renderer, CompassExtraRenderer extras) EntryRenderer renderer, CompassExtraRenderer extras)
{ {
constexpr int headerOffsetY = 1;
int columnWidth = display->getWidth() / 2; int columnWidth = display->getWidth() / 2;
int totalRowsAvailable = (display->getHeight() - y - FONT_HEIGHT_SMALL) / (FONT_HEIGHT_SMALL - 3);
int visibleNodeRows = std::min(6, totalRowsAvailable);
int rowYOffset = FONT_HEIGHT_SMALL - 3; int rowYOffset = FONT_HEIGHT_SMALL - 3;
display->clear(); display->clear();
drawScreenHeader(display, title, x, y); drawScreenHeader(display, title, x, y);
y += headerOffsetY;
std::vector<NodeEntry> nodeList; std::vector<NodeEntry> nodeList;
retrieveAndSortNodes(nodeList); retrieveAndSortNodes(nodeList);
int totalEntries = nodeList.size(); int totalEntries = nodeList.size();
int maxScroll = calculateMaxScroll(totalEntries, visibleNodeRows); int totalRowsAvailable = (display->getHeight() - y - FONT_HEIGHT_SMALL) / (FONT_HEIGHT_SMALL - 3);
scrollIndex = std::min(scrollIndex, maxScroll); int visibleNodeRows = std::min(6, totalRowsAvailable);
meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum()); meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
double userLat = 0.0, userLon = 0.0; double userLat = 0.0, userLon = 0.0;
@ -1973,7 +1977,7 @@ void drawNodeListWithExtrasScreen(OLEDDisplay *display, OLEDDisplayUiState *stat
int startIndex = scrollIndex * visibleNodeRows * 2; int startIndex = scrollIndex * visibleNodeRows * 2;
int endIndex = std::min(startIndex + visibleNodeRows * 2, totalEntries); int endIndex = std::min(startIndex + visibleNodeRows * 2, totalEntries);
int yOffset = rowYOffset; int yOffset = rowYOffset + headerOffsetY;
int col = 0; int col = 0;
int lastNodeY = y; int lastNodeY = y;
int shownCount = 0; int shownCount = 0;
@ -1993,17 +1997,16 @@ void drawNodeListWithExtrasScreen(OLEDDisplay *display, OLEDDisplayUiState *stat
shownCount++; shownCount++;
if (y + yOffset > display->getHeight() - FONT_HEIGHT_SMALL) { if (y + yOffset > display->getHeight() - FONT_HEIGHT_SMALL) {
yOffset = rowYOffset; yOffset = rowYOffset + headerOffsetY;
col++; col++;
if (col > 1) if (col > 1)
break; break;
} }
} }
drawColumnSeparator(display, x, y + FONT_HEIGHT_SMALL - 2, lastNodeY); drawColumnSeparator(display, x, y + FONT_HEIGHT_SMALL, lastNodeY + headerOffsetY);
drawScrollbar(display, visibleNodeRows, totalEntries, scrollIndex, 2, rowYOffset); drawScrollbar(display, visibleNodeRows, totalEntries, scrollIndex, 2, rowYOffset);
} }
// Public screen entry for compass // Public screen entry for compass
static void drawNodeListWithCompasses(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) static void drawNodeListWithCompasses(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{ {