archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt/Logs: Fixing spaces, optimize string to html conversion

Browse source
This commit is contained in:
Elad Ashkenazi 2024-05-04 12:36:35 +03:00
parent 4fc7e27417
commit 6a776624ac
1 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

31
rpcs3/rpcs3qt/log_frame.cpp
View file

@ -693,9 +693,34 @@ void log_frame::UpdateUI()
const QString font_start_tag_stack = "<font color = \"" % m_color_stack.name() % "\">"; const QString font_start_tag_stack = "<font color = \"" % m_color_stack.name() % "\">";
static const QString font_end_tag = QStringLiteral("</font>"); static const QString font_end_tag = QStringLiteral("</font>");
static constexpr auto escaped = [](const QString& text) static constexpr auto escaped = [](const QString& text, QString&& storage) -> const QString&
{ {
return text.toHtmlEscaped().replace(QStringLiteral("\n"), QStringLiteral("<br/>")); const qsizetype nline = text.indexOf(QChar('\n'));
const qsizetype spaces = text.indexOf(QStringLiteral(" "));
const qsizetype html = std::max<qsizetype>({ text.indexOf(QChar('<')), text.indexOf(QChar('>')), text.indexOf(QChar('&')), text.indexOf(QChar('\"')) });
const qsizetype pos = std::max<qsizetype>({ html, nline, spaces });
if (pos < 0)
{
// Nothing to change, do not create copies of the string
return text;
}
// Allow to return reference of new string by using temporary storage provided by argument
storage = html < 0 ? text : text.toHtmlEscaped();
if (nline >= 0)
{
storage.replace(QChar('\n'), QStringLiteral("<br/>"));
}
if (spaces >= 0)
{
storage.replace(QChar::Space, QChar::Nbsp);
}
return storage;
}; };
// Preserve capacity // Preserve capacity
@ -866,7 +891,7 @@ void log_frame::UpdateUI()
} }
// Print UTF-8 text. // Print UTF-8 text.
m_log_text += escaped(qstr(packet->msg)); m_log_text += escaped(qstr(packet->msg), QString{});
if (m_stack_log) if (m_stack_log)
{ {