ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-23 19:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore PiP minimizing

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-11-09 17:43:19 +04:00
parent 5239728f7c
commit 267f551b8c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
submodules/TelegramUI/TelegramUI/OverlayMediaControllerNode.swift
View File

@ -224,8 +224,6 @@ final class OverlayMediaControllerNode: ASDisplayNode, UIGestureRecognizerDelega
} }
} }
shouldHide = false
return (result, shouldHide) return (result, shouldHide)
} }
@ -323,13 +321,13 @@ final class OverlayMediaControllerNode: ASDisplayNode, UIGestureRecognizerDelega
let translation = recognizer.translation(in: self.view) let translation = recognizer.translation(in: self.view)
var nodeFrame = draggingNode.frame var nodeFrame = draggingNode.frame
nodeFrame.origin = self.draggingStartPosition.offsetBy(dx: translation.x, dy: translation.y) nodeFrame.origin = self.draggingStartPosition.offsetBy(dx: translation.x, dy: translation.y)
// if nodeFrame.midX < 0.0 { if nodeFrame.midX < 0.0 {
// draggingNode.updateMinimizedEdge(.left, adjusting: true) draggingNode.updateMinimizedEdge(.left, adjusting: true)
// } else if nodeFrame.midX > validLayout.size.width { } else if nodeFrame.midX > validLayout.size.width {
// draggingNode.updateMinimizedEdge(.right, adjusting: true) draggingNode.updateMinimizedEdge(.right, adjusting: true)
// } else { } else {
draggingNode.updateMinimizedEdge(nil, adjusting: true) draggingNode.updateMinimizedEdge(nil, adjusting: true)
// } }
draggingNode.frame = nodeFrame draggingNode.frame = nodeFrame
} }
case .ended, .cancelled: case .ended, .cancelled:
@ -339,13 +337,13 @@ final class OverlayMediaControllerNode: ASDisplayNode, UIGestureRecognizerDelega
let (updatedLocation, shouldDismiss) = self.nodeLocationForPosition(layout: validLayout, position: CGPoint(x: previousFrame.midX, y: previousFrame.midY), velocity: recognizer.velocity(in: self.view), size: nodeSize, tempExtendedTopInset: draggingNode.tempExtendedTopInset) let (updatedLocation, shouldDismiss) = self.nodeLocationForPosition(layout: validLayout, position: CGPoint(x: previousFrame.midX, y: previousFrame.midY), velocity: recognizer.velocity(in: self.view), size: nodeSize, tempExtendedTopInset: draggingNode.tempExtendedTopInset)
// if shouldDismiss && draggingNode.isMinimizeable { if shouldDismiss && draggingNode.isMinimizeable {
// draggingNode.updateMinimizedEdge(updatedLocation.x.isZero ? .left : .right, adjusting: false) draggingNode.updateMinimizedEdge(updatedLocation.x.isZero ? .left : .right, adjusting: false)
// self.videoNodes[index].isMinimized = true self.videoNodes[index].isMinimized = true
// } else { } else {
draggingNode.updateMinimizedEdge(nil, adjusting: true) draggingNode.updateMinimizedEdge(nil, adjusting: true)
self.videoNodes[index].isMinimized = false self.videoNodes[index].isMinimized = false
// } }
if let group = draggingNode.group { if let group = draggingNode.group {
self.locationByGroup[group] = updatedLocation self.locationByGroup[group] = updatedLocation