From 4f7aa15416e17f42af8b493e7e9bf5641ae88ede Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Jul 2022 17:11:15 +0300
Subject: [PATCH] Fix emoji panel footer updating.

---
 .../chat_helpers/stickers_list_footer.cpp       | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
index 79f9db7a6..22682db7e 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_footer.cpp
@@ -485,8 +485,6 @@ void StickersListFooter::setSelectedSubicon(
 	}
 	_subiconState.selected = newSelected;
 	const auto info = subiconInfo(_subiconState.selected);
-	UpdateAnimated(_subiconState.selectionX, info.left, animations);
-	UpdateAnimated(_subiconState.selectionWidth, info.width, animations);
 	const auto relativeLeft = info.left;
 	const auto subiconsWidthForCentering = 2 * relativeLeft + info.width;
 	const auto subiconsXFinal = std::clamp(
@@ -515,8 +513,6 @@ void StickersListFooter::processHideFinished() {
 	_subiconState.animation.stop();
 	_subiconState.animationStart = 0;
 	_subiconState.x.finish();
-	_subiconState.selectionX.finish();
-	_subiconState.selectionWidth.finish();
 	_horizontal = false;
 }
 
@@ -648,7 +644,6 @@ void StickersListFooter::resizeEvent(QResizeEvent *e) {
 		resizeSearchControls();
 	}
 	refreshIconsGeometry(ValidateIconAnimations::None);
-	refreshSubiconsGeometry();
 }
 
 void StickersListFooter::resizeSearchControls() {
@@ -747,13 +742,6 @@ void StickersListFooter::mouseReleaseEvent(QMouseEvent *e) {
 			const auto info = iconInfo(icon->index);
 			_iconState.selectionX = anim::value(info.left, info.left);
 			_iconState.selectionWidth = anim::value(info.width, info.width);
-			const auto subinfo = subiconInfo(icon->subindex);
-			_subiconState.selectionX = anim::value(
-				subinfo.left,
-				subinfo.left);
-			_subiconState.selectionWidth = anim::value(
-				subinfo.width,
-				subinfo.width);
 			const auto setId = _icons[icon->index].setId;
 			_setChosen.fire_copy((setId == AllEmojiSectionSetId())
 				? EmojiSectionSetId(
@@ -1000,7 +988,8 @@ void StickersListFooter::refreshIconsGeometry(
 		(_singleWidth - st::emojiIconArea) / 2,
 		(st::emojiFooterHeight - st::emojiIconArea) / 2);
 	refreshScrollableDimensions();
-	updateSelected();
+	refreshSubiconsGeometry();
+	_iconState.selected = _subiconState.selected = -1;
 	validateSelectedIcon(_activeByScrollId, animations);
 	update();
 }
@@ -1008,8 +997,6 @@ void StickersListFooter::refreshIconsGeometry(
 void StickersListFooter::refreshSubiconsGeometry() {
 	using Section = Ui::Emoji::Section;
 	_subiconState.x.finish();
-	_subiconState.selectionX.finish();
-	_subiconState.selectionWidth.finish();
 	_subiconState.animationStart = 0;
 	_subiconState.animation.stop();
 	const auto half = _singleWidth / 2;