mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge commit 'bdd09fa9bfea949f797fecad6a5e5c7b2c2e71ca'
This commit is contained in:
commit
5b1f434e19
@ -1342,7 +1342,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView, UIGestureRecognizerD
|
||||
|
||||
if let reactionButtonsNode = self.reactionButtonsNode {
|
||||
let reactionButtonsSize = reactionButtonsNode.frame.size
|
||||
let reactionButtonsFrame = CGRect(origin: CGPoint(x: videoFrame.minX, y: videoFrame.maxY + 6.0), size: reactionButtonsSize)
|
||||
var reactionButtonsFrame = CGRect(origin: CGPoint(x: videoFrame.minX, y: videoFrame.maxY + 6.0), size: reactionButtonsSize)
|
||||
if !incoming {
|
||||
reactionButtonsFrame.origin.x = videoFrame.maxX - reactionButtonsSize.width
|
||||
}
|
||||
|
@ -1478,20 +1478,13 @@ private class QrContentNode: ASDisplayNode {
|
||||
|
||||
self.wallpaperBackgroundNode.update(wallpaper: wallpaper)
|
||||
|
||||
if isDarkAppearance && selectedEmoticon == defaultEmoticon {
|
||||
self.codeForegroundDimNode.alpha = 1.0
|
||||
} else {
|
||||
self.codeForegroundDimNode.alpha = isDarkAppearance ? 0.4 : 0.3
|
||||
}
|
||||
self.codeForegroundDimNode.alpha = isDarkAppearance ? 0.5 : 0.3
|
||||
|
||||
if self.codeForegroundContentNode == nil, let contentNode = self.wallpaperBackgroundNode.makeDimmedNode() {
|
||||
contentNode.frame = CGRect(origin: CGPoint(x: -self.codeForegroundNode.frame.minX, y: -self.codeForegroundNode.frame.minY), size: self.wallpaperBackgroundNode.frame.size)
|
||||
self.codeForegroundContentNode = contentNode
|
||||
self.codeForegroundNode.insertSubnode(contentNode, at: 0)
|
||||
}
|
||||
if isDarkAppearance && selectedEmoticon == defaultEmoticon, let codeForegroundContentNode = self.codeForegroundContentNode {
|
||||
codeForegroundContentNode.removeFromSupernode()
|
||||
self.codeForegroundContentNode = nil
|
||||
}
|
||||
}
|
||||
|
||||
func updateLayout(size: CGSize, topInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user