feedc0de/esp-gui-lib
1
0
Fork 0
Code Issues 6 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed popup display text not being rendered

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-11-22 17:02:15 +01:00
parent 0f89f6c994
commit 324a6718e7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/messagepopupdisplay.cpp
View File

@ -1,5 +1,8 @@
#include "messagepopupdisplay.h" #include "messagepopupdisplay.h"
// system includes
#include <string_view>
// 3rdparty lib includes // 3rdparty lib includes
#include <tftinstance.h> #include <tftinstance.h>
#include <screenmanager.h> #include <screenmanager.h>
@ -42,6 +45,8 @@ void MessagePopupDisplay::initOverlay()
CPP_UNUSED(right) CPP_UNUSED(right)
tft.setTextFont(4);
tft.drawSunkenRect(leftMargin, topMargin, width, height, tft.drawSunkenRect(leftMargin, topMargin, width, height,
color565(240, 240, 240), color565(240, 240, 240),
color565(100, 100, 100), color565(100, 100, 100),
@ -51,6 +56,7 @@ void MessagePopupDisplay::initOverlay()
int x = leftMargin + 5; int x = leftMargin + 5;
int y = topMargin + 5; int y = topMargin + 5;
for (char c : m_message) for (char c : m_message)
{ {
if (c == '\n' || x > tft.width() - rightMargin - 10) if (c == '\n' || x > tft.width() - rightMargin - 10)
@ -61,7 +67,7 @@ void MessagePopupDisplay::initOverlay()
if (c != '\n') if (c != '\n')
{ {
const auto addedWidth = tft.drawChar(tft.decodeUTF8(c), x, y, 4); const auto addedWidth = tft.drawString(std::string_view{&c, 1}, x, y);
x += addedWidth; x += addedWidth;
} }