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

Move rich text escape methods to helper .h .cpp files

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-04-27 17:07:08 +02:00
parent 76041027df
commit 7e17dcf7d8
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -81,6 +81,7 @@ set(sources
src/screenmanager.cpp
src/splitgraphdisplay.cpp
src/popupdisplay.cpp
src/richtexthelper.cpp
src/richtextrenderer.cpp
src/icons/back.cpp
src/icons/checked.cpp

18
src/richtexthelper.cpp Normal file
View File

@ -0,0 +1,18 @@
#include "richtexthelper.h"
// 3rdparty lib includes
#include <strutils.h>
namespace espgui {
void richTextEscape(std::string &subject)
{
cpputils::stringReplaceAll('&', "&&", subject);
}
std::string richTextEscape(std::string_view subject)
{
return cpputils::stringReplaceAll('&', "&&", subject);
}
} // namespace espgui

8
src/richtexthelper.h
View File

@ -1,5 +1,9 @@
#pragma once
// system includes
#include <string>
#include <string_view>
namespace espgui {
namespace colors {
constexpr char RED[] = "&1"; // #ff0000 (TFT_RED)
@ -17,4 +21,8 @@ constexpr char SMALL[] = "&s"; // tft.setTextFont(2)
constexpr char MEDIUM[] = "&m"; // tft.setTextFont(4)
constexpr char RESTORE[] = "&f"; // restore original font
} // namespace fonts
void richTextEscape(std::string &subject);
std::string richTextEscape(std::string_view subject);
} // namespace espgui

11
src/richtextrenderer.cpp
View File

@ -4,7 +4,6 @@
#include <string_view>
// 3rdparty lib includes
#include <strutils.h>
#include <fontrenderer.h>
// local includes
@ -13,16 +12,6 @@
namespace espgui {
void richTextEscape(std::string &subject)
{
cpputils::stringReplaceAll('&', "&&", subject);
}
std::string richTextEscape(std::string_view subject)
{
return cpputils::stringReplaceAll('&', "&&", subject);
}
int16_t renderRichText(TftInterface &tft, std::string_view str, int32_t poX, int32_t poY, uint16_t color, uint16_t bgcolor, uint8_t font)
{
FontRenderer fontRenderer{tft};

3
src/richtextrenderer.h
View File

@ -9,9 +9,6 @@ namespace espgui { class TftInterface; class FontRenderer; }
namespace espgui {
void richTextEscape(std::string &subject);
std::string richTextEscape(std::string_view subject);
int16_t renderRichText(TftInterface &tft, std::string_view str, int32_t poX, int32_t poY, uint16_t color, uint16_t bgcolor, uint8_t font);
int16_t renderRichText(TftInterface &tft, FontRenderer &fontRenderer, std::string_view str, int32_t poX, int32_t poY, uint16_t color, uint16_t bgcolor, uint8_t font);