Various Fixes

This commit is contained in:
Ilya Laktyushin 2021-10-29 02:24:39 +04:00
parent 20d8cba4a1
commit 4f172ecbb9
2 changed files with 5 additions and 2 deletions

View File

@ -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))

View File

@ -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))