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

Fix issue with ao line edit not correctly preserving selection

Browse Source 
Resolve a segfault with text formatting
Implement ability to color text inline by selecting text and using the color dropdown

TODO: allow html characters to be used for coloring text, oof
This commit is contained in:
Crystalwarrior 2019-09-25 04:45:45 +03:00
parent b67f083506
commit 0649884d3c
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aolineedit.cpp
View File

@ -13,8 +13,8 @@ void AOLineEdit::mouseDoubleClickEvent(QMouseEvent *e)
void AOLineEdit::focusOutEvent(QFocusEvent *ev) void AOLineEdit::focusOutEvent(QFocusEvent *ev)
{ {
int start = selectionStart(); int start = selectionStart();
int end = selectionEnd(); int len = selectionLength();
QLineEdit::focusOutEvent(ev); QLineEdit::focusOutEvent(ev);
if (p_selection && start != -1 && end != -1) if (p_selection && start != -1 && len != -1)
this->setSelection(start, end); this->setSelection(start, len);
} }

25
src/courtroom.cpp
View File

@ -2156,7 +2156,7 @@ QString Courtroom::filter_ic_text(QString p_text, bool colorize, int pos, int de
break; //Prevent it from looping forward for whatever reason break; //Prevent it from looping forward for whatever reason
} }
} }
else if (f_character == markdown_start || (f_character == markdown_end && ic_color_stack.top() == c)) else if (f_character == markdown_start || (f_character == markdown_end && !ic_color_stack.empty() && ic_color_stack.top() == c))
{ {
if (colorize) if (colorize)
{ {
@ -2547,8 +2547,8 @@ void Courtroom::chat_tick()
{ {
//Clear the stored optimization information //Clear the stored optimization information
// color_rgb_list.at(c); // color_rgb_list.at(c);
QString markdown_start = color_markdown_start_list.at(c); QString markdown_start = color_markdown_start_list.at(c).toHtmlEscaped();
QString markdown_end = color_markdown_end_list.at(c); QString markdown_end = color_markdown_end_list.at(c).toHtmlEscaped();
bool markdown_remove = color_markdown_remove_list.at(c); bool markdown_remove = color_markdown_remove_list.at(c);
bool color_is_talking = color_markdown_talking_list.at(c); bool color_is_talking = color_markdown_talking_list.at(c);
if (markdown_start.isEmpty()) if (markdown_start.isEmpty())
@ -3846,8 +3846,23 @@ void Courtroom::on_text_color_changed(int p_color)
{ {
if (ui_ic_chat_message->selectionStart() != -1) //We have a selection! if (ui_ic_chat_message->selectionStart() != -1) //We have a selection!
{ {
qDebug() << "Setting color to selection" << ui_ic_chat_message->selectionStart() << ui_ic_chat_message->selectionEnd(); int c = color_row_to_number.at(p_color);
ui_ic_chat_message->end(false); QString markdown_start = color_markdown_start_list.at(c);
if (markdown_start.isEmpty())
{
qDebug() << "W: Color list dropdown selected a non-existent markdown start character";
return;
}
QString markdown_end = color_markdown_end_list.at(c);
if (markdown_end.isEmpty())
markdown_end = markdown_start;
int start = ui_ic_chat_message->selectionStart();
int end = ui_ic_chat_message->selectionEnd()+1;
ui_ic_chat_message->setCursorPosition(start);
ui_ic_chat_message->insert(markdown_start);
ui_ic_chat_message->setCursorPosition(end);
ui_ic_chat_message->insert(markdown_end);
// ui_ic_chat_message->end(false);
ui_text_color->setCurrentIndex(0); ui_text_color->setCurrentIndex(0);
} }
else else