aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Attorney_Online_remake.pro2
-rw-r--r--aoapplication.h2
-rw-r--r--courtroom.cpp10
3 files changed, 10 insertions, 4 deletions
diff --git a/Attorney_Online_remake.pro b/Attorney_Online_remake.pro
index 202c93e..32a76e2 100644
--- a/Attorney_Online_remake.pro
+++ b/Attorney_Online_remake.pro
@@ -13,7 +13,7 @@ RC_ICONS = logo.ico
TARGET = Attorney_Online_remake
TEMPLATE = app
-VERSION = 2.4.9.0
+VERSION = 2.4.10.0
SOURCES += main.cpp\
lobby.cpp \
diff --git a/aoapplication.h b/aoapplication.h
index 2aa7d16..f69a0ea 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -225,7 +225,7 @@ public:
private:
const int RELEASE = 2;
const int MAJOR_VERSION = 4;
- const int MINOR_VERSION = 9;
+ const int MINOR_VERSION = 10;
QString current_theme = "default";
diff --git a/courtroom.cpp b/courtroom.cpp
index 76d6b03..eb6a786 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -1174,8 +1174,14 @@ void Courtroom::append_ic_text(QString p_text, QString p_name)
else
{
// The user hasn't selected any text and the scrollbar is at the top: scroll to the top.
- ui_ic_chatlog->moveCursor(move_op);
- ui_ic_chatlog->verticalScrollBar()->setValue(scrollbar_limit);
+ if(ao_app->ic_scroll_down_enabled()) {
+ 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());
+ }
}
}