From 715a77d461c3ee2028fa8f01189e5e04673ca17c Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Fri, 29 Oct 2021 02:43:46 +0400
Subject: [PATCH] Various Fixes

---
 submodules/SettingsUI/Sources/ThemeCarouselItem.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift
index 3bfeb43441..ac4dcdeaca 100644
--- a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift
+++ b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift
@@ -659,7 +659,7 @@ class ThemeCarouselThemeItemNode: ListViewItemNode, ItemListItemNode {
         self.enqueuedTransitions.remove(at: 0)
         
         var options = ListViewDeleteAndInsertOptions()
-        if self.initialized && transition.crossfade {
+        if transition.crossfade {
             options.insert(.AnimateCrossfade)
         }
         options.insert(.Synchronous)
@@ -695,6 +695,7 @@ class ThemeCarouselThemeItemNode: ListViewItemNode, ItemListItemNode {
                     strongSelf.item = item
                     strongSelf.layoutParams = params
 
+                    strongSelf.listNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor
                     strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor
                     strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
                     strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
@@ -782,7 +783,7 @@ class ThemeCarouselThemeItemNode: ListViewItemNode, ItemListItemNode {
                         }
                     }
                     let previousEntries = strongSelf.entries ?? []
-                    let crossfade = previousEntries.count != entries.count
+                    let crossfade = (previousEntries.count > 0 && previousEntries.count != entries.count) || (previousEntries.count > 0 && previousEntries.count < 3 && entries.count > 3)
                     let transition = preparedTransition(context: item.context, action: action, contextAction: item.contextAction, from: previousEntries, to: entries, crossfade: crossfade, updatePosition: false)
                     strongSelf.enqueueTransition(transition)