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

Fix for Mail notification not drawing screen.

Browse Source
This commit is contained in:
HarukiToreda 2025-04-08 01:05:52 -04:00
parent 7c4ac89059
commit 2a4582da20
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/graphics/Screen.cpp
View File

@ -1158,14 +1158,14 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y)
const int topY = iconY + 1; const int topY = iconY + 1;
const int bottomY = iconY + iconH - 2; const int bottomY = iconY + iconH - 2;
const int centerX = iconX + iconW / 2; const int centerX = iconX + iconW / 2;
const int peakY = bottomY - 1; // Slightly raised peak for visual centering const int peakY = bottomY - 1;
// Draw "M" diagonals // Draw "M" diagonals
display->drawLine(leftX, topY, centerX, peakY); display->drawLine(leftX, topY, centerX, peakY);
display->drawLine(rightX, topY, centerX, peakY); display->drawLine(rightX, topY, centerX, peakY);
} else { } else {
// Small icon for non-wide screens // Small icon for non-wide screens
const int iconX = timeX - mail_width + 2;//move mail icon by 2 closer to the time const int iconX = timeX - mail_width;
const int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2; const int iconY = textY + (FONT_HEIGHT_SMALL - mail_height) / 2;
display->drawXbm(iconX, iconY, mail_width, mail_height, mail); display->drawXbm(iconX, iconY, mail_width, mail_height, mail);
} }
@ -3412,11 +3412,8 @@ void Screen::setFrames(FrameFocus focus)
// Check if the module being drawn has requested focus // Check if the module being drawn has requested focus
// We will honor this request later, if setFrames was triggered by a UIFrameEvent // We will honor this request later, if setFrames was triggered by a UIFrameEvent
MeshModule *m = *i; MeshModule *m = *i;
if (m->isRequestingFocus()) { if (m->isRequestingFocus())
fsi.positions.focusedModule = numframes; fsi.positions.focusedModule = numframes;
}
// Identify the position of specific modules, if we need to know this later
if (m == waypointModule) if (m == waypointModule)
fsi.positions.waypoint = numframes; fsi.positions.waypoint = numframes;
@ -3436,8 +3433,10 @@ void Screen::setFrames(FrameFocus focus)
normalFrames[numframes++] = screen->digitalWatchFace ? &Screen::drawDigitalClockFrame : &Screen::drawAnalogClockFrame; normalFrames[numframes++] = screen->digitalWatchFace ? &Screen::drawDigitalClockFrame : &Screen::drawAnalogClockFrame;
#endif #endif
// If we have a text message - show it next, unless it's a phone message and we aren't using any special modules // ✅ Declare this early so it’s available in FOCUS_PRESERVE block
if (devicestate.has_rx_text_message && shouldDrawMessage(&devicestate.rx_text_message)) { bool willInsertTextMessage = shouldDrawMessage(&devicestate.rx_text_message);
if (willInsertTextMessage) {
fsi.positions.textMessage = numframes; fsi.positions.textMessage = numframes;
normalFrames[numframes++] = drawTextMessageFrame; normalFrames[numframes++] = drawTextMessageFrame;
} }
@ -3484,8 +3483,7 @@ void Screen::setFrames(FrameFocus focus)
// Add function overlay here. This can show when notifications muted, modifier key is active etc // Add function overlay here. This can show when notifications muted, modifier key is active etc
static OverlayCallback functionOverlay[] = {drawFunctionOverlay}; static OverlayCallback functionOverlay[] = {drawFunctionOverlay};
static const int functionOverlayCount = sizeof(functionOverlay) / sizeof(functionOverlay[0]); ui->setOverlays(functionOverlay, sizeof(functionOverlay) / sizeof(functionOverlay[0]));
ui->setOverlays(functionOverlay, functionOverlayCount);
prevFrame = -1; // Force drawNodeInfo to pick a new node (because our list prevFrame = -1; // Force drawNodeInfo to pick a new node (because our list
// just changed) // just changed)
@ -3508,14 +3506,19 @@ void Screen::setFrames(FrameFocus focus)
ui->switchToFrame(fsi.positions.focusedModule); ui->switchToFrame(fsi.positions.focusedModule);
break; break;
case FOCUS_PRESERVE: case FOCUS_PRESERVE: {
// If we can identify which type of frame "originalPosition" was, can move directly to it in the new frameset
const FramesetInfo &oldFsi = this->framesetInfo; const FramesetInfo &oldFsi = this->framesetInfo;
if (originalPosition == oldFsi.positions.log)
// ✅ Fix: Account for new message insertion shifting frame positions
if (willInsertTextMessage && fsi.positions.textMessage <= originalPosition) {
originalPosition++;
}
if (originalPosition == oldFsi.positions.log && fsi.positions.log < fsi.frameCount)
ui->switchToFrame(fsi.positions.log); ui->switchToFrame(fsi.positions.log);
else if (originalPosition == oldFsi.positions.settings) else if (originalPosition == oldFsi.positions.settings && fsi.positions.settings < fsi.frameCount)
ui->switchToFrame(fsi.positions.settings); ui->switchToFrame(fsi.positions.settings);
else if (originalPosition == oldFsi.positions.wifi) else if (originalPosition == oldFsi.positions.wifi && fsi.positions.wifi < fsi.frameCount)
ui->switchToFrame(fsi.positions.wifi); ui->switchToFrame(fsi.positions.wifi);
// If frame count has decreased // If frame count has decreased
@ -3527,15 +3530,13 @@ void Screen::setFrames(FrameFocus focus)
// Unless that would put us "out of bounds" (< 0) // Unless that would put us "out of bounds" (< 0)
else else
ui->switchToFrame(0); ui->switchToFrame(0);
} } else if (originalPosition < fsi.frameCount)
// If we're not sure exactly which frame we were on, at least return to the same frame number
// (node frames; module frames)
else
ui->switchToFrame(originalPosition); ui->switchToFrame(originalPosition);
else
ui->switchToFrame(fsi.frameCount - 1);
break; break;
} }
}
// Store the info about this frameset, for future setFrames calls // Store the info about this frameset, for future setFrames calls
this->framesetInfo = fsi; this->framesetInfo = fsi;
@ -4063,15 +4064,18 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
int Screen::handleTextMessage(const meshtastic_MeshPacket *packet) int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
{ {
if (showingNormalScreen) { if (showingNormalScreen) {
if (packet->from == 0) {
// Outgoing message // Outgoing message
if (packet->from == 0) setFrames(FOCUS_PRESERVE); // Stay on same frame, silently add/remove frames
setFrames(FOCUS_PRESERVE); // Return to same frame (quietly hiding the rx text message frame) } else {
// Incoming message // Incoming message
else
//setFrames(FOCUS_TEXTMESSAGE); // Focus on the new message //setFrames(FOCUS_TEXTMESSAGE); // Focus on the new message
hasUnreadMessage = true; //Tells the UI that there's a new message and tiggers header to draw Mail Icon devicestate.has_rx_text_message = true; // Needed to include the message frame
hasUnreadMessage = true; // Enables mail icon in the header
setFrames(FOCUS_PRESERVE); // Refresh frame list without switching view
forceDisplay(); // Forces screen redraw (this works in your codebase)
} }
}
return 0; return 0;
} }