fix(lazy-layout): scroll to bottom

SevenTV · Sep 7, 2023 · ec0cddb · ec0cddb
1 parent 66ed6a3
commit ec0cddb
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
@@ -229,8 +229,15 @@ void ChannelView::initializeLayout()
 void ChannelView::initializeScrollbar()
 {
     this->scrollBar_->getCurrentValueChanged().connect([this] {
-        this->performLayout(true);
-        this->queueUpdate();
+        if (this->isVisible() || !getSettings()->lazyChannelLayout)
+        {
+            this->performLayout(true);
+            this->queueUpdate();
+        }
+        else
+        {
+            this->layoutQueued_ = true;
+        }
     });
 }
 
@@ -922,6 +929,11 @@ void ChannelView::messageAppended(MessagePtr &message,
         else
         {
             this->scrollBar_->offsetMinimum(1);
+            if (this->showingLatestMessages_ && !this->isVisible() &&
+                getSettings()->lazyChannelLayout)
+            {
+                this->scrollBar_->scrollToBottom(false);
+            }
             this->selection_.shiftMessageIndex(1);
         }
     }