noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #221

Browse source
This commit is contained in:
fourtf 2018-01-11 21:03:40 +01:00
parent a7fa4160e8
commit a339c4ca0a
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/widgets/helper/channelview.cpp
View file

@ -378,10 +378,12 @@ void ChannelView::setChannel(SharedChannel newChannel)
auto messageRef = new MessageLayout(message); auto messageRef = new MessageLayout(message);
if (this->messages.pushBack(MessageLayoutPtr(messageRef), deleted)) { if (this->messages.pushBack(MessageLayoutPtr(messageRef), deleted)) {
if (this->scrollBar.isAtBottom()) { if (!this->paused) {
this->scrollBar.scrollToBottom(); if (this->scrollBar.isAtBottom()) {
} else { this->scrollBar.scrollToBottom();
this->scrollBar.offset(-1); } else {
this->scrollBar.offset(-1);
}
} }
} }
@ -404,11 +406,13 @@ void ChannelView::setChannel(SharedChannel newChannel)
messageRefs.at(i) = MessageLayoutPtr(new MessageLayout(messages.at(i))); messageRefs.at(i) = MessageLayoutPtr(new MessageLayout(messages.at(i)));
} }
if (this->messages.pushFront(messageRefs).size() > 0) { if (!this->paused) {
if (this->scrollBar.isAtBottom()) { if (this->messages.pushFront(messageRefs).size() > 0) {
this->scrollBar.scrollToBottom(); if (this->scrollBar.isAtBottom()) {
} else { this->scrollBar.scrollToBottom();
this->scrollBar.offset((qreal)messages.size()); } else {
this->scrollBar.offset((qreal)messages.size());
}
} }
} }