Skip to content

Commit 02f8aba

Browse files
committed
Fix highlight image rendering
1 parent e75e007 commit 02f8aba

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Source/FDWaveformView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,14 +370,14 @@ open class FDWaveformView: UIView {
370370
scaledX = CGFloat(cachedSampleRange.lowerBound - zoomSamples.lowerBound) / CGFloat(zoomSamples.count)
371371
scaledWidth = CGFloat(cachedSampleRange.last! - zoomSamples.lowerBound) / CGFloat(zoomSamples.count) // forced unwrap is safe
372372
scaledHighlightedX = CGFloat((highlightedSamples?.lowerBound ?? 0) - zoomSamples.lowerBound) / CGFloat(zoomSamples.count)
373-
scaledHighlightedWidth = CGFloat((highlightedSamples?.last ?? 0) - zoomSamples.lowerBound) / CGFloat(zoomSamples.count)
373+
let highlightLastPortion = CGFloat((highlightedSamples?.last ?? 0) - zoomSamples.lowerBound) / CGFloat(zoomSamples.count)
374+
scaledHighlightedWidth = highlightLastPortion - scaledHighlightedX
374375
}
375376
let childFrame = CGRect(x: frame.width * scaledX, y: 0, width: frame.width * scaledWidth, height: frame.height)
376377
imageView.frame = childFrame
377-
highlightedImage.frame = childFrame
378+
highlightedImage.frame = CGRect(x: frame.width * scaledX - frame.width * scaledHighlightedX, y: 0, width: frame.width * scaledWidth, height: frame.height)
378379
clipping.frame = CGRect(x: frame.width * scaledHighlightedX, y: 0, width: frame.width * scaledHighlightedWidth, height: frame.height)
379380
clipping.isHidden = !(highlightedSamples?.overlaps(zoomSamples) ?? false)
380-
print("layed-out frames: \(frame) -- \(imageView.frame)")
381381
}
382382

383383
func renderWaveform() {

0 commit comments

Comments
 (0)