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

Fix crash for empty string

Browse Source
This commit is contained in:
CommanderRedYT
2023-02-18 13:20:22 +01:00
parent ed892388f6
commit de5ac4c8c2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/changevaluedisplay_string.cpp
View File

@ -45,9 +45,9 @@ void espgui::ChangeValueDisplay<std::string>::redraw(TftInterface &tft)
FontRenderer fontRenderer{tft}; FontRenderer fontRenderer{tft};
const auto now_ts = espchrono::millis_clock::now().time_since_epoch(); const auto now_ts = espchrono::millis_clock::now().time_since_epoch();
const auto char_width = fontRenderer.textWidth(m_value, 4) / ((!m_value.empty()) ? m_value.size() : 1); const uint16_t char_width = fontRenderer.textWidth(m_value, 4) / ((!m_value.empty()) ? m_value.size() : 1);
const auto maxChars = (tft.width() - 40) / char_width; const int16_t maxChars = char_width > 0 ? ((tft.width() - 40) / char_width) : 0;
const auto substr_from = std::max(0U, m_value.size() < maxChars ? 0 : static_cast<int>(m_value.size()) - maxChars); const auto substr_from = std::max(0, m_value.size() < maxChars ? 0 : static_cast<int>(m_value.size()) - maxChars);
const auto string = m_value.substr(substr_from); const auto string = m_value.substr(substr_from);
if (m_needsClear) if (m_needsClear)