Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Meme fix to <>, ~~ and ~> parsing (does not fully solve the issue but at least hides it from the user)

Browse Source 
Allow ascii characters to be used for color dropdown symbols
This commit is contained in:
Crystalwarrior 2019-10-05 16:47:59 +03:00
parent 9451822e09
commit bc8158cc96
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/courtroom.cpp
View File

@ -2023,19 +2023,28 @@ QString Courtroom::filter_ic_text(QString p_text, bool html, int target_pos, int
if (p_text.trimmed().startsWith("~~")) if (p_text.trimmed().startsWith("~~"))
{ {
p_text.remove(p_text.indexOf("~~"), 2); p_text.remove(p_text.indexOf("~~"), 2);
target_pos -= 2; if (target_pos != -1)
{
target_pos = qMax(0, target_pos - 2);
}
align = "center"; align = "center";
} }
else if (p_text.trimmed().startsWith("~>")) else if (p_text.trimmed().startsWith("~>"))
{ {
p_text.remove(p_text.indexOf("~>"), 2); p_text.remove(p_text.indexOf("~>"), 2);
target_pos -= 2; if (target_pos != -1)
{
target_pos = qMax(0, target_pos - 2);
}
align = "right"; align = "right";
} }
else if (p_text.trimmed().startsWith("<>")) else if (p_text.trimmed().startsWith("<>"))
{ {
p_text.remove(p_text.indexOf("<>"), 2); p_text.remove(p_text.indexOf("<>"), 2);
target_pos -= 2; if (target_pos != -1)
{
target_pos = qMax(0, target_pos - 2);
}
align = "justify"; align = "justify";
} }

2
src/text_file_functions.cpp
View File

@ -441,7 +441,7 @@ QString AOApplication::get_chat_markdown(QString p_identifier, QString p_chat)
if (f_result == "") if (f_result == "")
f_result = read_design_ini(p_identifier, default_path); 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) QColor AOApplication::get_chat_color(QString p_identifier, QString p_chat)