1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

fix(chatform): Markdown after emojis

Fix #3260
This commit is contained in:
tux3 2016-05-09 22:07:21 +02:00
parent 98aa922c31
commit 998f0915db
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -201,11 +201,11 @@ QString ChatMessage::detectMarkdown(const QString &str)
{ {
QString snipCheck = out.mid(offset-1,exp.cap(0).length()+2); QString snipCheck = out.mid(offset-1,exp.cap(0).length()+2);
QString snippet = exp.cap(0).trimmed(); QString snippet = exp.cap(0).trimmed();
QString htmledSnippet; QString htmledSnippet;
// Only parse if surrounded by spaces, newline(s) and/or beginning/end of line // Only parse if surrounded by spaces, newline(s) and/or beginning/end of line
if ((snipCheck.startsWith(' ') || snipCheck.startsWith('>') || offset == 0) && ((snipCheck.endsWith(' ') || snipCheck.endsWith('<')) || offset + snippet.toHtmlEscaped().length() == out.toHtmlEscaped().length())) if ((snipCheck.startsWith(' ') || snipCheck.startsWith('>') || offset == 0)
&& ((snipCheck.endsWith(' ') || snipCheck.endsWith('<')) || offset + snippet.length() == out.length()))
{ {
int mul = 0; // Determines how many characters to strip from markdown text int mul = 0; // Determines how many characters to strip from markdown text
// Set mul depending on markdownPreference // Set mul depending on markdownPreference