Various fixes

This commit is contained in:
Ilya Laktyushin 2023-11-02 17:10:14 +04:00
parent 5b6f79e6f5
commit 752ee7d24f
3 changed files with 10 additions and 4 deletions

View File

@ -837,7 +837,7 @@ public final class DatePickerNode: ASDisplayNode {
dayNode.attributedText = NSAttributedString(string: shortStringForDayOfWeek(strings: self.strings, day: dayIndex % 7).uppercased(), font: dayFont, textColor: theme.secondaryTextColor)
let textSize = dayNode.updateLayout(constrainedSize)
let cellFrame = CGRect(x: daysSideInset + CGFloat(i) * cellSize, y: topInset - 38.0, width: cellSize, height: cellSize)
let cellFrame = CGRect(x: floorToScreenPixels((size.width - constrainedSize.width) / 2.0) + daysSideInset + CGFloat(i) * cellSize, y: topInset - 38.0, width: cellSize, height: cellSize)
let textFrame = CGRect(origin: CGPoint(x: cellFrame.minX + floor((cellFrame.width - textSize.width) / 2.0), y: cellFrame.minY + floor((cellFrame.height - textSize.height) / 2.0)), size: textSize)
dayNode.frame = textFrame

View File

@ -109,7 +109,10 @@ final class EmojiPickerItemNode: ListViewItemNode {
let insets: UIEdgeInsets
let separatorHeight = UIScreenPixel
let contentSize = CGSize(width: params.width, height: params.availableHeight - 452.0)
var contentSize = CGSize(width: params.width, height: params.availableHeight - 452.0)
if params.width <= 320.0 {
contentSize.height += 77.0
}
insets = itemListNeighborsGroupedInsets(neighbors, params)
let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: contentSize.height - 20.0), insets: insets)

View File

@ -172,7 +172,7 @@ final class PeerNameColorChatPreviewItemNode: ListViewItemNode {
currentBackgroundNode?.updateBubbleTheme(bubbleTheme: item.componentTheme, bubbleCorners: item.chatBubbleCorners)
}
let insets: UIEdgeInsets
var insets: UIEdgeInsets
let separatorHeight = UIScreenPixel
let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt64Value(1))
@ -192,7 +192,7 @@ final class PeerNameColorChatPreviewItemNode: ListViewItemNode {
}
var media: [Media] = []
if let (site, title, text) = messageItem.linkPreview {
if let (site, title, text) = messageItem.linkPreview, params.width > 320.0 {
media.append(TelegramMediaWebpage(webpageId: MediaId(namespace: 0, id: 0), content: .Loaded(TelegramMediaWebpageLoadedContent(url: "", displayUrl: "", hash: 0, type: nil, websiteName: site, title: title, text: text, embedUrl: nil, embedType: nil, embedSize: nil, duration: nil, author: nil, isMediaLargeByDefault: nil, image: nil, file: nil, story: nil, attributes: [], instantPage: nil))))
}
@ -239,6 +239,9 @@ final class PeerNameColorChatPreviewItemNode: ListViewItemNode {
contentSize.height += node.frame.size.height
}
insets = itemListNeighborsGroupedInsets(neighbors, params)
if params.width <= 320.0 {
insets.top = 0.0
}
let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
let layoutSize = layout.size