diff options
| author | Crystalwarrior <varsash@gmail.com> | 2019-10-05 16:47:59 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2019-10-05 16:47:59 +0300 |
| commit | bc8158cc96dd36a18ba18b0271331463cd81c497 (patch) | |
| tree | 0294b4a0ea0a23c107ea81cb912a208045dfbc90 /src | |
| parent | 9451822e0929643f638b3c79d4fd646df98b567a (diff) | |
Meme fix to <>, ~~ and ~> parsing (does not fully solve the issue but at least hides it from the user)
Allow ascii characters to be used for color dropdown symbols
Diffstat (limited to 'src')
| -rw-r--r-- | src/courtroom.cpp | 15 | ||||
| -rw-r--r-- | src/text_file_functions.cpp | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index ee744a87..e368a32a 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -2023,19 +2023,28 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, int if (p_text.trimmed().startsWith("~~")) { p_text.remove(p_text.indexOf("~~"), 2); - target_pos -= 2; + if (target_pos != -1) + { + target_pos = qMax(0, target_pos - 2); + } align = "center"; } else if (p_text.trimmed().startsWith("~>")) { p_text.remove(p_text.indexOf("~>"), 2); - target_pos -= 2; + if (target_pos != -1) + { + target_pos = qMax(0, target_pos - 2); + } align = "right"; } else if (p_text.trimmed().startsWith("<>")) { p_text.remove(p_text.indexOf("<>"), 2); - target_pos -= 2; + if (target_pos != -1) + { + target_pos = qMax(0, target_pos - 2); + } align = "justify"; } diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 35e42b4f..204de69f 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -441,7 +441,7 @@ QString AOApplication::get_chat_markdown(QString p_identifier, QString p_chat) if (f_result == "") f_result = read_design_ini(p_identifier, default_path); - return f_result; + return f_result.toLatin1(); } QColor AOApplication::get_chat_color(QString p_identifier, QString p_chat) |