Various fixes

This commit is contained in:
Ilya Laktyushin 2022-07-25 16:15:28 +03:00
parent 82926df73b
commit f1753011e1
4 changed files with 22 additions and 6 deletions

View File

@ -662,14 +662,17 @@ public class Window1 {
return return
} }
self.forceBadgeHidden = hidden self.forceBadgeHidden = hidden
self.updateBadgeVisibility(layout: self.windowLayout) self.updateBadgeVisibility()
} }
private func updateBadgeVisibility(layout: WindowLayout) { private func updateBadgeVisibility() {
let badgeIsHidden = !self.deviceMetrics.hasTopNotch || self.forceBadgeHidden || layout.size.width > layout.size.height let badgeIsHidden = !self.deviceMetrics.hasTopNotch || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height
if badgeIsHidden != self.badgeView.isHidden && !badgeIsHidden { if badgeIsHidden != self.badgeView.isHidden && !badgeIsHidden {
Queue.mainQueue().after(0.3) { Queue.mainQueue().after(0.4) {
self.badgeView.isHidden = badgeIsHidden let badgeShouldBeHidden = !self.deviceMetrics.hasTopNotch || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height
if badgeShouldBeHidden == badgeIsHidden {
self.badgeView.isHidden = badgeIsHidden
}
} }
} else { } else {
self.badgeView.isHidden = badgeIsHidden self.badgeView.isHidden = badgeIsHidden
@ -1115,7 +1118,7 @@ public class Window1 {
} }
if let image = self.badgeView.image { if let image = self.badgeView.image {
self.updateBadgeVisibility(layout: self.windowLayout) self.updateBadgeVisibility()
self.badgeView.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((self.windowLayout.size.width - image.size.width) / 2.0), y: 6.0), size: image.size) self.badgeView.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((self.windowLayout.size.width - image.size.width) / 2.0), y: 6.0), size: image.size)
} }
} }

View File

@ -214,6 +214,9 @@ class ChatMessageBubbleContentNode: ASDisplayNode {
func applyAbsoluteOffsetSpring(value: CGFloat, duration: Double, damping: CGFloat) { func applyAbsoluteOffsetSpring(value: CGFloat, duration: Double, damping: CGFloat) {
} }
func unreadMessageRangeUpdated() {
}
func reactionTargetView(value: String) -> UIView? { func reactionTargetView(value: String) -> UIView? {
return nil return nil
} }

View File

@ -3975,6 +3975,12 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
return nil return nil
} }
override func unreadMessageRangeUpdated() {
for contentNode in self.contentNodes {
contentNode.unreadMessageRangeUpdated()
}
}
func animateQuizInvalidOptionSelected() { func animateQuizInvalidOptionSelected() {
if let supernode = self.supernode, let subnodes = supernode.subnodes { if let supernode = self.supernode, let subnodes = supernode.subnodes {
for i in 0 ..< subnodes.count { for i in 0 ..< subnodes.count {

View File

@ -408,6 +408,10 @@ class ChatMessageGiftBubbleContentNode: ChatMessageBubbleContentNode {
} }
} }
override func unreadMessageRangeUpdated() {
self.updateVisibility()
}
private func updateVisibility() { private func updateVisibility() {
guard let item = self.item else { guard let item = self.item else {
return return