Merge 9045caa025 into 1a00d91316

Merge pull request #1833 from Integral-Tech/refactor-string-conversion
refactor: use fmt lib to avoid back-and-forth conversion
2024-11-23 19:38:48 +03:00 · 2024-11-05 00:46:46 +08:00 · 2024-10-30 01:10:07 +00:00 · 2024-10-19 16:49:12 +08:00
1 changed files with 3 additions and 2 deletions
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@ -20,6 +20,8 @@
 #include <QVideoFrame>
 #include <QVideoSink>
 #include <fmt/format.h>
 #include <nlohmann/json.hpp>
 #include <mtx/responses/common.hpp>
@ -578,8 +580,7 @@ InputBar::message(const QString &msg, MarkdownOverride useMarkdown, bool rainbow
                }
            }
-            text.body =
+            text.body = fmt::format("{}\n{}", body.toStdString(), text.body);
              QStringLiteral("%1\n%2").arg(body, QString::fromStdString(text.body)).toStdString();
            // NOTE(Nico): rich replies always need a formatted_body!
            text.format = "org.matrix.custom.html";
Author	SHA1	Message	Date
Loren Burkholder	463bf570f8	Merge `9045caa025` into `1a00d91316`	2024-11-05 00:46:46 +08:00
DeepBlueV7.X	1a00d91316	Merge pull request #1833 from Integral-Tech/refactor-string-conversion refactor: use fmt lib to avoid back-and-forth conversion	2024-10-30 01:10:07 +00:00
Integral	b7a5d714c6	refactor: use fmt lib to avoid back-and-forth conversion	2024-10-19 16:49:12 +08:00