mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix news not parsing correctly

Browse Source
This commit is contained in:
Christian Kaiser 2024-08-20 04:12:53 -03:00 committed by David Capello
parent aed9127b51
commit 7d80ff120c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/ui/news_listbox.cpp
View File

@ -79,15 +79,15 @@ std::string parse_html(const std::string& str)
std::string tag = str.substr(j, i - j);
if (tag == "li") {
if (!paraOpen)
if (!paraOpen && result.back() != '\n')
result.push_back('\n');
result.push_back((char)0xc2);
result.push_back((char)0xb7); // middle dot
result.push_back(' ');
paraOpen = false;
}
else if (tag == "p" || tag == "ul") {
if (!paraOpen)
else if (tag == "p" || tag == "ul" || tag[0] == 'h') {
if (!paraOpen && result.back() != '\n')
result.push_back('\n');
paraOpen = true;
}
@ -123,7 +123,14 @@ std::string parse_html(const std::string& str)
paraOpen = false;
}
else {
result.push_back(str[i++]);
auto character = str[i++];
if (character == '\n') {
// Rely only on paragraphs for newlines, otherwise we render them as just spaces because sometimes they show up in the middle of sentences.
result.push_back(' ');
}
else {
result.push_back(character);
}
paraOpen = false;
}
}
@ -150,8 +157,10 @@ protected:
setTextQuiet(m_title);
gfx::Size sz = theme->calcSizeHint(this, style);
if (!m_desc.empty())
sz.h *= 5;
if (!m_desc.empty()) {
// Title + number of total lines
sz.h *= 1 + std::count(m_desc.begin(), m_desc.end(), '\n');
}
ev.setSizeHint(gfx::Size(0, sz.h));
}