From a58c41be96916dee97f6a9e724b3eb02a38a567a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Jul 2022 19:57:56 +0300
Subject: [PATCH] Fix scrolling of emoji categories.

---
 Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp    | 6 ------
 Telegram/SourceFiles/chat_helpers/emoji_list_widget.h      | 1 -
 Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp | 3 ++-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
index 5130fe6e5..6c5bade44 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@@ -1711,10 +1711,6 @@ QPoint EmojiListWidget::buttonRippleTopLeft(int section) const {
 			: QPoint());
 }
 
-void EmojiListWidget::showEmojiSection(Section section) {
-	showSet(EmojiSectionSetId(section));
-}
-
 void EmojiListWidget::refreshEmoji() {
 	refreshRecent();
 	refreshCustom();
@@ -1723,8 +1719,6 @@ void EmojiListWidget::refreshEmoji() {
 void EmojiListWidget::showSet(uint64 setId) {
 	clearSelection();
 
-	refreshEmoji();
-
 	auto y = 0;
 	enumerateSections([&](const SectionInfo &info) {
 		if (setId == sectionSetId(info.section)) {
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
index 598e14edc..6a32ca010 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
@@ -68,7 +68,6 @@ public:
 	void clearSelection() override;
 	object_ptr<TabbedSelector::InnerFooter> createFooter() override;
 
-	void showEmojiSection(Section section);
 	void showSet(uint64 setId);
 	[[nodiscard]] uint64 currentSet(int yOffset) const;
 
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 8fc1ca6d4..e2368b3b6 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -819,7 +819,8 @@ void StickersListFooter::scrollByWheelEvent(
 		}
 	};
 	const auto index = v::get<IconId>(_selected).index;
-	if (_icons[index].setId == AllEmojiSectionSetId()) {
+	if (_subiconsExpanded
+		&& _icons[index].setId == AllEmojiSectionSetId()) {
 		use(_subiconState);
 	} else {
 		use(_iconState);