From a23bd5f3ffcc2dfd1a1f08da810fc65a1d4c1377 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 26 Jan 2023 12:59:30 +0300
Subject: [PATCH] Fixed selecting of stickers in userpic emoji builder.

---
 .../info/userpic/info_userpic_emoji_builder_widget.cpp   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index bdb9e74b6d..f7e09938e4 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -279,10 +279,11 @@ void EmojiSelector::createSelector(Type type) {
 		createSelector(isEmoji ? Type::Stickers : Type::Emoji);
 	});
 
-	_scroll->scrollTopChanges(
-	) | rpl::start_with_next([=] {
-		const auto scrollTop = _scroll->scrollTop();
-		const auto scrollBottom = scrollTop + _scroll->height();
+	rpl::combine(
+		_scroll->scrollTopValue(),
+		_scroll->heightValue()
+	) | rpl::start_with_next([=](int scrollTop, int scrollHeight) {
+		const auto scrollBottom = scrollTop + scrollHeight;
 		selector.list->setVisibleTopBottom(scrollTop, scrollBottom);
 	}, selector.list->lifetime());