Skip to content

Fix Crop→Blur viewport desync after a crop zoom change #310

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

Merged
muukii merged 1 commit into from
Jun 17, 2026
Merged

Fix Crop→Blur viewport desync after a crop zoom change #310

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
15 changes: 14 additions & 1 deletion Sources/BrightroomUI/Shared/Components/Crop/CropView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,20 @@ extension CropView {
// while the scroll view's model values are already clamped to the minimum
// zoom. Derive both the sampled output rect and the canvas placement from
// layer conversion so the mask canvas follows that visible bounce.
let usesPresentationLayers = toolSurface.isInteractiveZoomGestureActive == false
//
// Presentation-layer reads are ONLY valid while the viewport display link is
// actively re-sampling that in-flight bounce. When the tool viewport is
// applied as a one-shot with the link idle — e.g. entering Blur from Crop,
// where `updateToolScrollGeometry` just reconfigured the freshly-un-hidden
// scroll view synchronously in this same runloop turn — the presentation
// layers still hold the previous session's geometry until the next Core
// Animation commit. Sampling them then renders the crop output small and
// pinned to the top-left, and with no display link to re-sample, that stale
// frame sticks until the next mode switch (the "switch back and forth fixes
// it" symptom). Fall back to the model layers, which the synchronous
// reconfigure already made authoritative, whenever the link is idle.
let usesPresentationLayers = toolSurface.viewportRendering.isRunning
&& toolSurface.isInteractiveZoomGestureActive == false
let canvasFrame = Self.currentLayerRect(
bounds,
from: self,
Expand Down
Loading