From 1fa5d273cce742340787f7278a5fbb89738ae45e Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 2 Oct 2021 16:03:26 +0300 Subject: [PATCH] Fixed scroll in Dialogs::Widget. Regression was introduced in cb8f49aea0. --- Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 376bc5c3f..f457761fb 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -205,7 +205,11 @@ Widget::Widget( ) | rpl::to_empty); connect(_inner, SIGNAL(draggingScrollDelta(int)), this, SLOT(onDraggingScrollDelta(int))); - connect(_inner, SIGNAL(mustScrollTo(int,int)), _scroll, SLOT(scrollToY(int,int))); + connect(_inner, &InnerWidget::mustScrollTo, [=](int top, int bottom) { + if (_scroll) { + _scroll->scrollToY(top, bottom); + } + }); connect(_inner, SIGNAL(dialogMoved(int,int)), this, SLOT(onDialogMoved(int,int))); connect(_inner, SIGNAL(searchMessages()), this, SLOT(onNeedSearchMessages())); connect(_inner, SIGNAL(completeHashtag(QString)), this, SLOT(onCompleteHashtag(QString))); @@ -238,7 +242,10 @@ Widget::Widget( ) | rpl::start_with_next(crl::guard(_inner, [=] { _inner->onParentGeometryChanged(); }), lifetime()); - connect(_scroll, SIGNAL(scrolled()), this, SLOT(onListScroll())); + _scroll->scrolls( + ) | rpl::start_with_next([=] { + onListScroll(); + }, lifetime()); session().data().chatsListChanges( ) | rpl::filter([=](Data::Folder *folder) {