Merge branch 'public-beta' into develop
This commit is contained in:
commit
06ba758309
|
@ -40,6 +40,7 @@ class AttachmentThumbnailController: ViewController {
|
||||||
case .video, .gifv:
|
case .video, .gifv:
|
||||||
let asset = AVURLAsset(url: url)
|
let asset = AVURLAsset(url: url)
|
||||||
let imageGenerator = AVAssetImageGenerator(asset: asset)
|
let imageGenerator = AVAssetImageGenerator(asset: asset)
|
||||||
|
imageGenerator.appliesPreferredTrackTransform = true
|
||||||
#if os(visionOS)
|
#if os(visionOS)
|
||||||
#warning("Use async AVAssetImageGenerator.image(at:)")
|
#warning("Use async AVAssetImageGenerator.image(at:)")
|
||||||
#else
|
#else
|
||||||
|
@ -91,6 +92,7 @@ class AttachmentThumbnailController: ViewController {
|
||||||
if type.conforms(to: .movie) {
|
if type.conforms(to: .movie) {
|
||||||
let asset = AVURLAsset(url: url)
|
let asset = AVURLAsset(url: url)
|
||||||
let imageGenerator = AVAssetImageGenerator(asset: asset)
|
let imageGenerator = AVAssetImageGenerator(asset: asset)
|
||||||
|
imageGenerator.appliesPreferredTrackTransform = true
|
||||||
#if os(visionOS)
|
#if os(visionOS)
|
||||||
#warning("Use async AVAssetImageGenerator.image(at:)")
|
#warning("Use async AVAssetImageGenerator.image(at:)")
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -265,10 +265,8 @@ private class VideoScrubbingControl: UIControl {
|
||||||
|
|
||||||
private func updateFillLayerMask() {
|
private func updateFillLayerMask() {
|
||||||
// I don't know where this animation is coming from
|
// I don't know where this animation is coming from
|
||||||
CATransaction.begin()
|
|
||||||
CATransaction.setDisableActions(true)
|
|
||||||
fillMaskLayer.frame = CGRect(x: 0, y: 0, width: fractionComplete * bounds.width, height: 8)
|
fillMaskLayer.frame = CGRect(x: 0, y: 0, width: fractionComplete * bounds.width, height: 8)
|
||||||
CATransaction.commit()
|
fillMaskLayer.removeAllAnimations()
|
||||||
}
|
}
|
||||||
|
|
||||||
override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
override func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
|
||||||
|
|
Loading…
Reference in New Issue