diff --git a/src/Titano.Ui/Visuals/Filmstrip.cs b/src/Titano.Ui/Visuals/Filmstrip.cs index efa9001a..fb639cb3 100644 --- a/src/Titano.Ui/Visuals/Filmstrip.cs +++ b/src/Titano.Ui/Visuals/Filmstrip.cs @@ -39,6 +39,9 @@ public sealed class Filmstrip : DrawingElement private static readonly MarkerKind[] Kinds = Enum.GetValues(); + /// The current-frame ▼ at x = 0; moved by so seeking allocates no geometry. + private static readonly Geometry CurrentMarker = CreateCurrentMarker(); + private LruCache _cache = new(256); private readonly HashSet _pending = []; private CancellationTokenSource _loads = new(); @@ -46,6 +49,7 @@ public sealed class Filmstrip : DrawingElement private Rect _cells; private bool _dragging; private int _wheelDelta; + private readonly TranslateTransform _markerShift = new(); static Filmstrip() { @@ -120,10 +124,10 @@ public sealed class Filmstrip : DrawingElement var outline = new Rect(left + 1, _cells.Top + 1, Math.Max(0, right - left - 2), Math.Max(0, _cells.Height - 2)); dc.DrawRectangle(null, GetPen("Brush.Accent", 2), outline); - var marker = new StreamGeometry(); - using (var ctx = marker.Open()) AddTriangleDown(ctx, _strip.XForFrame(frame), 1, 9); - marker.Freeze(); - dc.DrawGeometry(GetBrush("Brush.Accent"), null, marker); + _markerShift.X = _strip.XForFrame(frame); + dc.PushTransform(_markerShift); + dc.DrawGeometry(GetBrush("Brush.Accent"), null, CurrentMarker); + dc.Pop(); } protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e) @@ -219,6 +223,14 @@ public sealed class Filmstrip : DrawingElement private static void OnCacheCapacityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((Filmstrip)d)._cache.Capacity = (int)e.NewValue; + private static StreamGeometry CreateCurrentMarker() + { + var geometry = new StreamGeometry(); + using (var ctx = geometry.Open()) AddTriangleDown(ctx, 0, 1, 9); + geometry.Freeze(); + return geometry; + } + /// Draws scaled to cover , centred and cropped. private static void DrawCover(DrawingContext dc, ImageSource image, Rect cell) { diff --git a/src/Titano.Ui/Visuals/PreviewSurface.cs b/src/Titano.Ui/Visuals/PreviewSurface.cs index f8921f4f..d9756bfa 100644 --- a/src/Titano.Ui/Visuals/PreviewSurface.cs +++ b/src/Titano.Ui/Visuals/PreviewSurface.cs @@ -76,7 +76,6 @@ public sealed class PreviewSurface : DrawingElement RenderOptions.SetBitmapScalingMode(_original, mode); } if (view.Scale != _overlayScale) RefreshOverlay(); - UpdateWipeClip(); } /// Rebuilds the overlays (crop mask, region boundary, motion vectors) in image coordinates. diff --git a/src/Titano.Ui/Visuals/PreviewViewport.cs b/src/Titano.Ui/Visuals/PreviewViewport.cs index bcfc5bb3..77679d2c 100644 --- a/src/Titano.Ui/Visuals/PreviewViewport.cs +++ b/src/Titano.Ui/Visuals/PreviewViewport.cs @@ -363,10 +363,12 @@ public class PreviewViewport : Control if (ZoomMode == PreviewZoomMode.Actual) view = ViewportMath.SnapOffset(view, dpi); _view = view; _surface?.SetView(view, view.Scale * dpi); + var zoom = view.Scale * dpi; + if (zoom == Zoom) return; _syncingZoom = true; try { - SetCurrentValue(ZoomProperty, view.Scale * dpi); + SetCurrentValue(ZoomProperty, zoom); } finally {