From 0df306e68bf254722e33a29550ec12b9bb0e7a29 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Tue, 28 Feb 2023 20:47:03 -0500 Subject: Make emoji larger in the timeline by default --- src/Utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Utils.cpp') diff --git a/src/Utils.cpp b/src/Utils.cpp index b753cfdb..0ea5565b 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -141,7 +141,7 @@ utils::replaceEmoji(const QString &body) if (!insideTag && utils::codepointIsEmoji(code)) { if (!insideFontBlock) { fmtBody += QStringLiteral("emojiFont() % - QStringLiteral("\">"); + QStringLiteral("\" size=\"4\">"); insideFontBlock = true; } else if (code == 0xfe0f) { // BUG(Nico): -- cgit 1.5.1 From 3b3d9dff83482579218482b47da1b8a30db9c98e Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Thu, 9 Mar 2023 15:36:15 -0500 Subject: Only enlarge emoji if the setting is on --- src/Utils.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Utils.cpp') diff --git a/src/Utils.cpp b/src/Utils.cpp index 0ea5565b..3d29481c 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -141,7 +141,11 @@ utils::replaceEmoji(const QString &body) if (!insideTag && utils::codepointIsEmoji(code)) { if (!insideFontBlock) { fmtBody += QStringLiteral("emojiFont() % - QStringLiteral("\" size=\"4\">"); + QStringLiteral("\"") % + (UserSettings::instance()->enlargeEmojiOnlyMessages() + ? QStringLiteral(" size=\"4\"") + : QString{}) % + QStringLiteral(">"); insideFontBlock = true; } else if (code == 0xfe0f) { // BUG(Nico): -- cgit 1.5.1 From 04a26a5f4327973354c606eb7e0fcd943ed17916 Mon Sep 17 00:00:00 2001 From: Loren Burkholder <55629213+LorenDB@users.noreply.github.com> Date: Thu, 9 Mar 2023 13:04:53 -0800 Subject: Update src/Utils.cpp Co-authored-by: DeepBlueV7.X --- src/Utils.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Utils.cpp') diff --git a/src/Utils.cpp b/src/Utils.cpp index 3d29481c..63dcdd00 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -141,11 +141,9 @@ utils::replaceEmoji(const QString &body) if (!insideTag && utils::codepointIsEmoji(code)) { if (!insideFontBlock) { fmtBody += QStringLiteral("emojiFont() % - QStringLiteral("\"") % (UserSettings::instance()->enlargeEmojiOnlyMessages() - ? QStringLiteral(" size=\"4\"") - : QString{}) % - QStringLiteral(">"); + ? QStringLiteral("\" size=\"4\">") + : QStringLiteral("\">")); insideFontBlock = true; } else if (code == 0xfe0f) { // BUG(Nico): -- cgit 1.5.1