diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-10-08 12:12:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 12:12:26 +0200 |
| commit | fc3a64056cf3eed8d24c6c0a280b4bbd1cf2fce5 (patch) | |
| tree | 58ffc1768f26feaf36bb31ec44fe1fc990ba9411 /launcher/ui/widgets/InfoFrame.cpp | |
| parent | e3e9e394985e0327efe882d7b4e4c1d6a6cb6491 (diff) | |
| parent | 777ab3416f12c620daf111fb57ac357f5fc2af46 (diff) | |
| download | PrismLauncher-fc3a64056cf3eed8d24c6c0a280b4bbd1cf2fce5.tar.gz PrismLauncher-fc3a64056cf3eed8d24c6c0a280b4bbd1cf2fce5.tar.bz2 PrismLauncher-fc3a64056cf3eed8d24c6c0a280b4bbd1cf2fce5.zip | |
Merge pull request #1154 from Scrumplex/epic-formatting-codes
Diffstat (limited to 'launcher/ui/widgets/InfoFrame.cpp')
| -rw-r--r-- | launcher/ui/widgets/InfoFrame.cpp | 63 |
1 files changed, 38 insertions, 25 deletions
diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp index f78dbe16..fdc581b4 100644 --- a/launcher/ui/widgets/InfoFrame.cpp +++ b/launcher/ui/widgets/InfoFrame.cpp @@ -97,14 +97,6 @@ void InfoFrame::updateWithResource(const Resource& resource) setImage(); } -// https://www.sportskeeda.com/minecraft-wiki/color-codes -static const QMap<QChar, QString> s_value_to_color = { - {'0', "#000000"}, {'1', "#0000AA"}, {'2', "#00AA00"}, {'3', "#00AAAA"}, {'4', "#AA0000"}, - {'5', "#AA00AA"}, {'6', "#FFAA00"}, {'7', "#AAAAAA"}, {'8', "#555555"}, {'9', "#5555FF"}, - {'a', "#55FF55"}, {'b', "#55FFFF"}, {'c', "#FF5555"}, {'d', "#FF55FF"}, {'e', "#FFFF55"}, - {'f', "#FFFFFF"} -}; - QString InfoFrame::renderColorCodes(QString input) { // We have to manually set the colors for use. // @@ -113,32 +105,53 @@ QString InfoFrame::renderColorCodes(QString input) { // We traverse the description and, when one of those is found, we create // a span element with that color set. // - // TODO: Make the same logic for font formatting too. // TODO: Wrap links inside <a> tags + // https://minecraft.fandom.com/wiki/Formatting_codes#Color_codes + const QMap<QChar, QString> color_codes_map = { + {'0', "#000000"}, {'1', "#0000AA"}, {'2', "#00AA00"}, {'3', "#00AAAA"}, {'4', "#AA0000"}, + {'5', "#AA00AA"}, {'6', "#FFAA00"}, {'7', "#AAAAAA"}, {'8', "#555555"}, {'9', "#5555FF"}, + {'a', "#55FF55"}, {'b', "#55FFFF"}, {'c', "#FF5555"}, {'d', "#FF55FF"}, {'e', "#FFFF55"}, + {'f', "#FFFFFF"} + }; + // https://minecraft.fandom.com/wiki/Formatting_codes#Formatting_codes + const QMap<QChar, QString> formatting_codes_map = { + {'l', "b"}, {'m', "s"}, {'n', "u"}, {'o', "i"} + }; + QString html("<html>"); - bool in_div = false; + QList<QString> tags{}; auto it = input.constBegin(); while (it != input.constEnd()) { - if (*it == u'§') { - if (in_div) - html += "</span>"; - - auto const& num = *(++it); - html += QString("<span style=\"color: %1;\">").arg(s_value_to_color.constFind(num).value()); + // is current char § and is there a following char + if (*it == u'§' && (it + 1) != input.constEnd()) { + auto const& code = *(++it); // incrementing here! - in_div = true; + auto const color_entry = color_codes_map.constFind(code); + auto const tag_entry = formatting_codes_map.constFind(code); - it++; + if (color_entry != color_codes_map.constEnd()) { // color code + html += QString("<span style=\"color: %1;\">").arg(color_entry.value()); + tags << "span"; + } else if (tag_entry != formatting_codes_map.constEnd()) { // formatting code + html += QString("<%1>").arg(tag_entry.value()); + tags << tag_entry.value(); + } else if (code == 'r') { // reset all formatting + while (!tags.isEmpty()) { + html += QString("</%1>").arg(tags.takeLast()); + } + } else { // pass unknown codes through + html += QString("§%1").arg(code); + } + } else { + html += *it; } - - html += *it; it++; } - - if (in_div) - html += "</span>"; + while (!tags.isEmpty()) { + html += QString("</%1>").arg(tags.takeLast()); + } html += "</html>"; html.replace("\n", "<br>"); @@ -147,14 +160,14 @@ QString InfoFrame::renderColorCodes(QString input) { void InfoFrame::updateWithResourcePack(ResourcePack& resource_pack) { - setName(resource_pack.name()); + setName(renderColorCodes(resource_pack.name())); setDescription(renderColorCodes(resource_pack.description())); setImage(resource_pack.image({64, 64})); } void InfoFrame::updateWithTexturePack(TexturePack& texture_pack) { - setName(texture_pack.name()); + setName(renderColorCodes(texture_pack.name())); setDescription(renderColorCodes(texture_pack.description())); setImage(texture_pack.image({64, 64})); } |