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

fixed blank lines in IC log

Browse Source
This commit is contained in:
argoneus 2018-08-06 18:32:39 +02:00
parent bec2b7aef4
commit 25a45f2e87
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
courtroom.cpp
View File

@ -1139,6 +1139,9 @@ void Courtroom::handle_chatmessage_3()
void Courtroom::append_ic_text(QString p_text, QString p_name) void Courtroom::append_ic_text(QString p_text, QString p_name)
{ {
// a bit of a silly hack, should use QListWidget for IC in the first place though
static bool isEmpty = true;
QTextCharFormat bold; QTextCharFormat bold;
QTextCharFormat normal; QTextCharFormat normal;
bold.setFontWeight(QFont::Bold); bold.setFontWeight(QFont::Bold);
@ -1146,21 +1149,37 @@ void Courtroom::append_ic_text(QString p_text, QString p_name)
const QTextCursor old_cursor = ui_ic_chatlog->textCursor(); const QTextCursor old_cursor = ui_ic_chatlog->textCursor();
const int old_scrollbar_value = ui_ic_chatlog->verticalScrollBar()->value(); const int old_scrollbar_value = ui_ic_chatlog->verticalScrollBar()->value();
QTextCursor::MoveOperation move_op;
int scrollbar_limit; int scrollbar_limit;
if(ao_app->ic_scroll_down_enabled()) { if (ao_app->ic_scroll_down_enabled()) {
scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->maximum(); scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->maximum();
ui_ic_chatlog->moveCursor(QTextCursor::End); move_op = QTextCursor::End;
} }
else { else {
scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->minimum(); scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->minimum();
ui_ic_chatlog->moveCursor(QTextCursor::Start); move_op = QTextCursor::Start;
} }
const bool is_fully_scrolled = old_scrollbar_value == scrollbar_limit; const bool is_fully_scrolled = old_scrollbar_value == scrollbar_limit;
ui_ic_chatlog->textCursor().insertText(p_name, bold); ui_ic_chatlog->moveCursor(move_op);
ui_ic_chatlog->textCursor().insertText(p_text + '\n', normal);
if (ao_app->ic_scroll_down_enabled()) {
if (!isEmpty)
ui_ic_chatlog->textCursor().insertText("\n", normal);
else
isEmpty = false;
ui_ic_chatlog->textCursor().insertText(p_name, bold);
ui_ic_chatlog->textCursor().insertText(p_text, normal);
} else {
ui_ic_chatlog->textCursor().insertText(p_name, bold);
ui_ic_chatlog->textCursor().insertText(p_text, normal);
if (!isEmpty)
ui_ic_chatlog->textCursor().insertText("\n", normal);
else
isEmpty = false;
}
if (old_cursor.hasSelection() || !is_fully_scrolled) if (old_cursor.hasSelection() || !is_fully_scrolled)
{ {
@ -1171,14 +1190,14 @@ void Courtroom::append_ic_text(QString p_text, QString p_name)
else else
{ {
// The user hasn't selected any text and the scrollbar is at the top: scroll to the top. // The user hasn't selected any text and the scrollbar is at the top: scroll to the top.
if(ao_app->ic_scroll_down_enabled()) { ui_ic_chatlog->moveCursor(move_op);
ui_ic_chatlog->moveCursor(QTextCursor::End);
ui_ic_chatlog->verticalScrollBar()->setValue(ui_ic_chatlog->verticalScrollBar()->maximum()); // update the value to the new maximum/minimum
} if (ao_app->ic_scroll_down_enabled())
else { scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->maximum();
ui_ic_chatlog->moveCursor(QTextCursor::Start); else
ui_ic_chatlog->verticalScrollBar()->setValue(ui_ic_chatlog->verticalScrollBar()->minimum()); scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->minimum();
} ui_ic_chatlog->verticalScrollBar()->setValue(scrollbar_limit);
} }
} }