From 4f172ecbb9a9c0ad722c52c26cbbfdca649cdecf Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Fri, 29 Oct 2021 02:24:39 +0400 Subject: [PATCH] Various Fixes --- submodules/SettingsUI/Sources/ThemeCarouselItem.swift | 5 ++++- submodules/SettingsUI/Sources/ThemePickerGridItem.swift | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift index b200949f7a..3bfeb43441 100644 --- a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift +++ b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift @@ -39,6 +39,9 @@ private struct ThemeCarouselThemeEntry: Comparable, Identifiable { if lhs.index != rhs.index { return false } + if lhs.emojiFile?.fileId != rhs.emojiFile?.fileId { + return false + } if lhs.themeReference.index != rhs.themeReference.index { return false } @@ -404,7 +407,7 @@ private final class ThemeCarouselThemeItemIconNode : ListViewItemNode { strongSelf.emojiNode.isHidden = string == nil let emojiFrame = CGRect(origin: CGPoint(x: 33.0, y: 79.0), size: CGSize(width: 24.0, height: 24.0)) - if let file = item.emojiFile, currentItem == nil { + if let file = item.emojiFile, currentItem?.emojiFile == nil { let imageApply = strongSelf.emojiImageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: emojiFrame.size, boundingSize: emojiFrame.size, intrinsicInsets: UIEdgeInsets())) imageApply() strongSelf.emojiImageNode.setSignal(chatMessageStickerPackThumbnail(postbox: item.context.account.postbox, resource: file.resource, animated: true, nilIfEmpty: true)) diff --git a/submodules/SettingsUI/Sources/ThemePickerGridItem.swift b/submodules/SettingsUI/Sources/ThemePickerGridItem.swift index c53ad4e40c..37e75af408 100644 --- a/submodules/SettingsUI/Sources/ThemePickerGridItem.swift +++ b/submodules/SettingsUI/Sources/ThemePickerGridItem.swift @@ -248,7 +248,7 @@ private final class ThemeGridThemeItemIconNode : ASDisplayNode { self.emojiNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 79.0), size: CGSize(width: 90.0, height: 30.0)) let emojiFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - 42.0) / 2.0), y: 98.0), size: CGSize(width: 42.0, height: 42.0)) - if let file = item.emojiFile, currentItem == nil { + if let file = item.emojiFile, currentItem?.emojiFile == nil { let imageApply = self.emojiImageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: emojiFrame.size, boundingSize: emojiFrame.size, intrinsicInsets: UIEdgeInsets())) imageApply() self.emojiImageNode.setSignal(chatMessageStickerPackThumbnail(postbox: item.context.account.postbox, resource: file.resource, animated: true, nilIfEmpty: true))