From 335ce790e9209005dcd0704728dafc5923a1fd82 Mon Sep 17 00:00:00 2001
From: Anthony Bilinski <me@abilinski.com>
Date: Sat, 4 Apr 2020 22:45:36 -0700
Subject: [PATCH] revert(chatlog): "scroll bar stuck to bottom (fix #5755)"

This reverts commit 38df897e024393ba15c80017930dac19a92e13b7.
---
 src/widget/form/genericchatform.cpp | 17 +++--------------
 src/widget/form/genericchatform.h   |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index 927b2735d..e9d3a3c48 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -726,7 +726,7 @@ void GenericChatForm::loadHistoryTo(const QDateTime &time)
     }
 }
 
-bool GenericChatForm::loadHistoryFrom(const QDateTime &time)
+void GenericChatForm::loadHistoryFrom(const QDateTime &time)
 {
     chatWidget->setScroll(false);
     auto begin = chatLog.getFirstIdx();
@@ -738,20 +738,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)
@@ -1219,9 +1209,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)
diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h
index 9853eac4d..a7eb91870 100644
--- a/src/widget/form/genericchatform.h
+++ b/src/widget/form/genericchatform.h
@@ -130,7 +130,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);