From 324c39dded994c36e428dbaf31e111cc5dd11770 Mon Sep 17 00:00:00 2001
From: luvletter2333 <luvletter2333@gmail.com>
Date: Tue, 12 Apr 2022 14:15:04 +0800
Subject: [PATCH] Fix stickerset drag

---
 .../main/java/org/telegram/ui/Components/EmojiView.java   | 8 ++++++++
 .../org/telegram/ui/Components/ScrollSlidingTabStrip.java | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java
index 4ebce72f1..2b8abfae0 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java
@@ -1819,6 +1819,14 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific
                     final MediaDataController mediaDataController = MediaDataController.getInstance(currentAccount);
 
                     swapListElements(stickerSets, index1, index2);
+
+                    if (stickersTab.tabsContainer != null) {
+                        for (int i = fromPosition; i <= toPosition && i < stickersTab.tabsContainer.getChildCount(); i++) {
+                            View v = stickersTab.tabsContainer.getChildAt(i);
+                            v.setTag(R.id.index_tag, i);
+                        }
+                    }
+
                     if (hasChatStickers) {
                         swapListElements(mediaDataController.getStickerSets(MediaDataController.TYPE_IMAGE), index1 - 1, index2 - 1);
                     } else {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ScrollSlidingTabStrip.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ScrollSlidingTabStrip.java
index dd2652212..a0aaa2438 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ScrollSlidingTabStrip.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ScrollSlidingTabStrip.java
@@ -65,7 +65,7 @@ public class ScrollSlidingTabStrip extends HorizontalScrollView {
     private Type type = Type.LINE;
     private LinearLayout.LayoutParams defaultTabLayoutParams;
     private LinearLayout.LayoutParams defaultExpandLayoutParams;
-    private LinearLayout tabsContainer;
+    public LinearLayout tabsContainer;
     private ScrollSlidingTabStripDelegate delegate;
     private HashMap<String, View> tabTypes = new HashMap<>();
     private HashMap<String, View> prevTypes = new HashMap<>();