mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
revert(chatlog): "scroll bar stuck to bottom (fix #5755)"
This reverts commit 38df897e02
.
This commit is contained in:
parent
efff8d53c9
commit
4cd443ae7b
|
@ -690,7 +690,7 @@ void GenericChatForm::loadHistoryTo(const QDateTime &time)
|
|||
}
|
||||
}
|
||||
|
||||
bool GenericChatForm::loadHistoryFrom(const QDateTime &time)
|
||||
void GenericChatForm::loadHistoryFrom(const QDateTime &time)
|
||||
{
|
||||
chatWidget->setScroll(false);
|
||||
auto begin = ChatLogIdx(0);
|
||||
|
@ -702,20 +702,10 @@ bool GenericChatForm::loadHistoryFrom(const QDateTime &time)
|
|||
|
||||
int add = DEF_NUM_MSG_TO_LOAD;
|
||||
if (begin.get() + DEF_NUM_MSG_TO_LOAD > chatLog.getNextIdx().get()) {
|
||||
auto t = chatLog.getNextIdx();
|
||||
add = chatLog.getNextIdx().get() - begin.get();
|
||||
}
|
||||
|
||||
if (add <= 1) {
|
||||
chatWidget->setScroll(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
auto end = ChatLogIdx(begin.get() + add);
|
||||
|
||||
renderMessages(begin, end);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void GenericChatForm::removeFirstsMessages(const int num)
|
||||
|
@ -1163,9 +1153,8 @@ void GenericChatForm::loadHistoryUpper()
|
|||
}
|
||||
|
||||
auto msg = messages.crbegin()->second;
|
||||
if (loadHistoryFrom(QDateTime())) {
|
||||
chatWidget->scrollToLine(msg);
|
||||
}
|
||||
loadHistoryFrom(QDateTime());
|
||||
chatWidget->scrollToLine(msg);
|
||||
}
|
||||
|
||||
void GenericChatForm::updateShowDateInfo(const ChatLine::Ptr& prevLine, const ChatLine::Ptr& topLine)
|
||||
|
|
|
@ -137,7 +137,7 @@ private:
|
|||
QDateTime getTime(const ChatLine::Ptr& chatLine) const;
|
||||
void loadHistory(const QDateTime& time, const LoadHistoryDialog::LoadType type);
|
||||
void loadHistoryTo(const QDateTime& time);
|
||||
bool loadHistoryFrom(const QDateTime& time);
|
||||
void loadHistoryFrom(const QDateTime& time);
|
||||
void removeFirstsMessages(const int num);
|
||||
void removeLastsMessages(const int num);
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user