Skip to content

Fixed: 1. play handle view will escape start or end limits. 2. Start or end handle will stop few seconds before its limit. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ifamirhasan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed: 1. play handle view will escape start or end limits. 2. Start or end handle will stop few seconds before its limit. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions VideoTrim/Classes/VideoTrim.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,12 @@ open class VideoTrim: UIView {
let maximumTime = CGFloat(trimMaximumDuration.value) / CGFloat(trimMaximumDuration.timescale)
let makeTime = CGFloat(makeDuration.value) / CGFloat(makeDuration.timescale)
if maximumTime < makeTime {
// Snap to the maximum allowed start point
let maxWidth = frameWidth * (maximumTime / (CGFloat(asset!.duration.value) / CGFloat(asset!.duration.timescale)))
let newLeading = frameWidth - maxWidth - abs(trailingConstraint?.constant ?? 0)
leadingConstraint?.constant = max(0, newLeading)
updateTotalTime()
updatePlayTime()
return
}
}
Expand Down Expand Up @@ -916,6 +922,12 @@ open class VideoTrim: UIView {
let maximumTime = CGFloat(trimMaximumDuration.value) / CGFloat(trimMaximumDuration.timescale)
let makeTime = CGFloat(makeDuration.value) / CGFloat(makeDuration.timescale)
if maximumTime < makeTime {
// Snap to maximum allowed end point
let maxWidth = frameWidth * (maximumTime / (CGFloat(asset!.duration.value) / CGFloat(asset!.duration.timescale)))
let newTrailing = -(frameWidth - abs((leadingConstraint?.constant ?? 0)) - maxWidth)
trailingConstraint?.constant = min(0, newTrailing)
updateTotalTime()
updatePlayTime()
return
}
}
Expand Down Expand Up @@ -970,6 +982,21 @@ open class VideoTrim: UIView {
let point = sender.location(in: frameContainerView)
let constant = point.x
let playTimeLineViewLeadingConstraint = frameContainerView.constraints.filter({ $0.identifier == "playTimeLineViewLeading" }).first

if let leadingConstraint = frameContainerView.constraints.filter({ $0.identifier == "trimContainerViewLeading" }).first, let trailingConstraint = frameContainerView.constraints.filter({ $0.identifier == "trimContainerViewTrailing" }).first {
if leadingConstraint.constant > constant {
playTimeLineViewLeadingConstraint?.constant = leadingConstraint.constant
updatePlayTime()
delegate?.videoTrimPlayTimeChange(self)
return
} else if constant > frameWidth - abs(trailingConstraint.constant) - playLineWidth {
playTimeLineViewLeadingConstraint?.constant = frameWidth - abs(trailingConstraint.constant) - playLineWidth
updatePlayTime()
delegate?.videoTrimPlayTimeChange(self)
return
}
}

playTimeLineViewLeadingConstraint?.constant = constant + (playLineWidth / 2)
updatePlayTime()
delegate?.videoTrimPlayTimeChange(self)
Expand Down