mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-11-29 11:25:38 +00:00
Various fixes
This commit is contained in:
parent
72815547e2
commit
f2d7c9ab9b
@ -239,7 +239,7 @@ private final class ItemNode: ASDisplayNode {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
transition.updateAlpha(node: self.badgeContainerNode, alpha: (isDisabled || isReordering || unreadCount == 0) ? 0.0 : 1.0)
|
transition.updateAlpha(node: self.badgeContainerNode, alpha: (isEditing || isDisabled || isReordering || unreadCount == 0) ? 0.0 : 1.0)
|
||||||
|
|
||||||
let selectionAlpha: CGFloat = selectionFraction * selectionFraction
|
let selectionAlpha: CGFloat = selectionFraction * selectionFraction
|
||||||
let deselectionAlpha: CGFloat = isDisabled ? 0.5 : 1.0// - selectionFraction
|
let deselectionAlpha: CGFloat = isDisabled ? 0.5 : 1.0// - selectionFraction
|
||||||
|
|||||||
@ -667,12 +667,12 @@ class ItemListStickerPackItemNode: ItemListRevealOptionsItemNode {
|
|||||||
strongSelf.installationActionBackgroundNode.image = backgroundImage
|
strongSelf.installationActionBackgroundNode.image = backgroundImage
|
||||||
}
|
}
|
||||||
|
|
||||||
let installationActionFrame = CGRect(origin: CGPoint(x: params.width - rightInset - installWidth - 16.0, y: 0.0), size: CGSize(width: 50.0, height: layout.contentSize.height))
|
let installationActionFrame = CGRect(origin: CGPoint(x: params.width - rightInset - installWidth - 16.0, y: 0.0), size: CGSize(width: installWidth, height: layout.contentSize.height))
|
||||||
strongSelf.installationActionNode.frame = installationActionFrame
|
strongSelf.installationActionNode.frame = installationActionFrame
|
||||||
|
|
||||||
let buttonFrame = CGRect(origin: CGPoint(x: params.width - rightInset - installWidth - 16.0, y: installationActionFrame.minY + floor((installationActionFrame.size.height - 28.0) / 2.0)), size: CGSize(width: installWidth, height: 28.0))
|
let buttonFrame = CGRect(origin: CGPoint(x: params.width - rightInset - installWidth - 16.0, y: installationActionFrame.minY + floor((installationActionFrame.size.height - 28.0) / 2.0)), size: CGSize(width: installWidth, height: 28.0))
|
||||||
strongSelf.installationActionBackgroundNode.frame = buttonFrame
|
strongSelf.installationActionBackgroundNode.frame = buttonFrame
|
||||||
strongSelf.installTextNode.frame = CGRect(origin: CGPoint(x: buttonFrame.minX + floor((buttonFrame.width - installLayout.size.width) / 2.0), y: buttonFrame.minY + floor((buttonFrame.height - installLayout.size.height) / 2.0) + 1.0), size: installLayout.size)
|
strongSelf.installTextNode.frame = CGRect(origin: CGPoint(x: buttonFrame.minX + floorToScreenPixels((buttonFrame.width - installLayout.size.width) / 2.0), y: buttonFrame.minY + floorToScreenPixels((buttonFrame.height - installLayout.size.height) / 2.0) + 1.0), size: installLayout.size)
|
||||||
case .selection:
|
case .selection:
|
||||||
strongSelf.installationActionNode.isHidden = true
|
strongSelf.installationActionNode.isHidden = true
|
||||||
strongSelf.installationActionBackgroundNode.isHidden = true
|
strongSelf.installationActionBackgroundNode.isHidden = true
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user