This commit is contained in:
Ali 2023-07-17 20:43:10 +04:00
parent b81da3e62d
commit 93a9d65456
2 changed files with 21 additions and 13 deletions

View File

@ -1001,11 +1001,13 @@ public final class StoryPeerListComponent: Component {
var leftNeighborDistance: CGPoint?
var rightNeighborDistance: CGPoint?
if let leftItemFrame {
leftNeighborDistance = CGPoint(x: abs(leftItemFrame.midX - measuredItem.itemFrame.midX), y: leftItemFrame.minY - measuredItem.itemFrame.minY)
}
if let rightItemFrame {
rightNeighborDistance = CGPoint(x: abs(rightItemFrame.midX - measuredItem.itemFrame.midX), y: rightItemFrame.minY - measuredItem.itemFrame.minY)
if collapsedState.maxFraction < 0.5 {
if let leftItemFrame {
leftNeighborDistance = CGPoint(x: abs(leftItemFrame.midX - measuredItem.itemFrame.midX), y: leftItemFrame.minY - measuredItem.itemFrame.minY)
}
if let rightItemFrame {
rightNeighborDistance = CGPoint(x: abs(rightItemFrame.midX - measuredItem.itemFrame.midX), y: rightItemFrame.minY - measuredItem.itemFrame.minY)
}
}
let totalCount: Int
@ -1139,11 +1141,13 @@ public final class StoryPeerListComponent: Component {
var leftNeighborDistance: CGPoint?
var rightNeighborDistance: CGPoint?
if let leftItemFrame {
leftNeighborDistance = CGPoint(x: abs(leftItemFrame.midX - measuredItem.itemFrame.midX), y: leftItemFrame.minY - measuredItem.itemFrame.minY)
}
if let rightItemFrame {
rightNeighborDistance = CGPoint(x: abs(rightItemFrame.midX - measuredItem.itemFrame.midX), y: rightItemFrame.minY - measuredItem.itemFrame.minY)
if collapsedState.maxFraction < 0.5 {
if let leftItemFrame {
leftNeighborDistance = CGPoint(x: abs(leftItemFrame.midX - measuredItem.itemFrame.midX), y: leftItemFrame.minY - measuredItem.itemFrame.minY)
}
if let rightItemFrame {
rightNeighborDistance = CGPoint(x: abs(rightItemFrame.midX - measuredItem.itemFrame.midX), y: rightItemFrame.minY - measuredItem.itemFrame.minY)
}
}
let _ = visibleItem.view.update(

View File

@ -640,8 +640,9 @@ public final class StoryPeerListItemComponent: Component {
let minimizedLineWidth: CGFloat = 4.3
let indicatorLineSeenWidth: CGFloat = baseLineSeenWidth * component.scale + minimizedLineWidth * (1.0 - component.scale)
let indicatorLineUnseenWidth: CGFloat = baseLineUnseenWidth * component.scale + minimizedLineWidth * (1.0 - component.scale)
let normalizedScale = max(0.0, min(1.0, component.scale))
let indicatorLineSeenWidth: CGFloat = baseLineSeenWidth * normalizedScale + minimizedLineWidth * (1.0 - normalizedScale)
let indicatorLineUnseenWidth: CGFloat = baseLineUnseenWidth * normalizedScale + minimizedLineWidth * (1.0 - normalizedScale)
avatarNode.setPeer(
context: component.context,
@ -715,7 +716,10 @@ public final class StoryPeerListItemComponent: Component {
let baseRadius: CGFloat = 30.66
let collapsedRadius: CGFloat = 35.0
let indicatorRadius: CGFloat = baseRadius * component.scale + collapsedRadius * (1.0 - component.scale)
var indicatorRadius: CGFloat = baseRadius * normalizedScale + collapsedRadius * (1.0 - normalizedScale)
if component.scale > 1.0 {
indicatorRadius += max(0.0, component.scale - 1.0) * 0.0
}
self.indicatorShapeSeenLayer.lineWidth = indicatorLineSeenWidth
self.indicatorShapeUnseenLayer.lineWidth = indicatorLineUnseenWidth