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

Merge pull request #24 from ghostfeesh/version-bump

Browse Source 
Bump to 2.4.10, autoscrolling bug fixes
This commit is contained in:
oldmud0 2018-07-27 22:07:48 -04:00 committed by GitHub
commit 68a3f35fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Attorney_Online_remake.pro
View File

@ -13,7 +13,7 @@ RC_ICONS = logo.ico
TARGET = Attorney_Online_remake TARGET = Attorney_Online_remake
TEMPLATE = app TEMPLATE = app
VERSION = 2.4.9.0 VERSION = 2.4.10.0
SOURCES += main.cpp\ SOURCES += main.cpp\
lobby.cpp \ lobby.cpp \

2
aoapplication.h
View File

@ -225,7 +225,7 @@ public:
private: private:
const int RELEASE = 2; const int RELEASE = 2;
const int MAJOR_VERSION = 4; const int MAJOR_VERSION = 4;
const int MINOR_VERSION = 9; const int MINOR_VERSION = 10;
QString current_theme = "default"; QString current_theme = "default";

17
courtroom.cpp
View File

@ -1146,22 +1146,19 @@ 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();
move_op = QTextCursor::End; ui_ic_chatlog->moveCursor(QTextCursor::End);
} }
else { else {
scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->minimum(); scrollbar_limit = ui_ic_chatlog->verticalScrollBar()->minimum();
move_op = QTextCursor::Start; ui_ic_chatlog->moveCursor(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->moveCursor(move_op);
ui_ic_chatlog->textCursor().insertText(p_name, bold); ui_ic_chatlog->textCursor().insertText(p_name, bold);
ui_ic_chatlog->textCursor().insertText(p_text + '\n', normal); ui_ic_chatlog->textCursor().insertText(p_text + '\n', normal);
@ -1174,8 +1171,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.
ui_ic_chatlog->moveCursor(move_op); if(ao_app->ic_scroll_down_enabled()) {
ui_ic_chatlog->verticalScrollBar()->setValue(scrollbar_limit); ui_ic_chatlog->moveCursor(QTextCursor::End);
ui_ic_chatlog->verticalScrollBar()->setValue(ui_ic_chatlog->verticalScrollBar()->maximum());
}
else {
ui_ic_chatlog->moveCursor(QTextCursor::Start);
ui_ic_chatlog->verticalScrollBar()->setValue(ui_ic_chatlog->verticalScrollBar()->minimum());
}
} }
} }