pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-29 15:46:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Emote picker fix

Browse Source
This commit is contained in:
HarukiToreda 2025-09-28 02:32:28 -04:00
parent 4ae5e8a48e
commit 34bb858588
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/CannedMessageModule.cpp
View File

@ -1719,6 +1719,9 @@ void CannedMessageModule::drawEmotePickerScreen(OLEDDisplay *display, OLEDDispla
int _visibleRows = (display->getHeight() - listTop - 2) / rowHeight; int _visibleRows = (display->getHeight() - listTop - 2) / rowHeight;
int numEmotes = graphics::numEmotes; int numEmotes = graphics::numEmotes;
// keep member variable in sync
this->visibleRows = _visibleRows;
// Clamp highlight index // Clamp highlight index
if (emotePickerIndex < 0) if (emotePickerIndex < 0)
emotePickerIndex = 0; emotePickerIndex = 0;
@ -1740,7 +1743,7 @@ void CannedMessageModule::drawEmotePickerScreen(OLEDDisplay *display, OLEDDispla
// Draw emote rows // Draw emote rows
display->setTextAlignment(TEXT_ALIGN_LEFT); display->setTextAlignment(TEXT_ALIGN_LEFT);
for (int vis = 0; vis < visibleRows; ++vis) { for (int vis = 0; vis < _visibleRows; ++vis) {
int emoteIdx = topIndex + vis; int emoteIdx = topIndex + vis;
if (emoteIdx >= numEmotes) if (emoteIdx >= numEmotes)
break; break;
@ -1767,11 +1770,11 @@ void CannedMessageModule::drawEmotePickerScreen(OLEDDisplay *display, OLEDDispla
} }
// Draw scrollbar if needed // Draw scrollbar if needed
if (numEmotes > visibleRows) { if (numEmotes > _visibleRows) {
int scrollbarHeight = visibleRows * rowHeight; int scrollbarHeight = _visibleRows * rowHeight;
int scrollTrackX = display->getWidth() - 6; int scrollTrackX = display->getWidth() - 6;
display->drawRect(scrollTrackX, listTop, 4, scrollbarHeight); display->drawRect(scrollTrackX, listTop, 4, scrollbarHeight);
int scrollBarLen = std::max(6, (scrollbarHeight * visibleRows) / numEmotes); int scrollBarLen = std::max(6, (scrollbarHeight * _visibleRows) / numEmotes);
int scrollBarPos = listTop + (scrollbarHeight * topIndex) / numEmotes; int scrollBarPos = listTop + (scrollbarHeight * topIndex) / numEmotes;
display->fillRect(scrollTrackX, scrollBarPos, 4, scrollBarLen); display->fillRect(scrollTrackX, scrollBarPos, 4, scrollBarLen);
} }