@pro-gram/flux 1.5.0 → 1.6.1

package/source/EditorView.cs

@@ -16,7 +16,7 @@ using Path = System.IO.Path;
 
 namespace DrumBuddy
 {
-    public sealed class EditorView : Grid, IDisposable
+    public sealed partial class EditorView : Grid, IDisposable
     {
         private const double RowHeight = 56, RulerHeight = 26;
         private readonly Window owner;
@@ -35,7 +35,13 @@ namespace DrumBuddy
         private readonly ScrollViewer scroll, headerScroll;
         private readonly TextBlock title, positionText, selectionText;
         private readonly TextBox selectionFrom, selectionTo;
-        private readonly ComboBox zoom, scope, exportFormat;
+        private readonly ComboBox scope, exportFormat;
+        private readonly Slider zoomSlider;
+        private readonly TextBlock zoomSpan;
+        private readonly Button fitSelection;
+        private readonly WaveformDetail waveformDetail;
+        private bool updatingZoom;
+        private DateTime manualViewUntil;
         private readonly CheckBox separate, selectionOnly, protect;
         private readonly Button play, undoButton, redoButton, cancel;
         private readonly Slider volume;
@@ -47,13 +53,21 @@ namespace DrumBuddy
         private readonly CheckBox snapGrid, snapEdges, gridTriplet;
         private readonly TextBlock meterText;
         private readonly WrapPanel gridControls;
-        private static readonly double[] ZoomLevels = { 5, 10, 20, 40, 80, 160, 320, 640, 1280, 2560 };
         public Action GridSettingsRequested;
         public TempoGridOptions GridOptions { get { return session.Grid.Copy(); } }
         private readonly Grid editorBody;
         private readonly DockablePane recordingPane;
         private readonly Button recordButton;
-        private readonly ToggleButton scissorsTool;
+        private bool sliceCursor, clipSelection, selectionMoved;
+        private string pendingRegion;
+        private double selectionPointerX;
+        private readonly HashSet<string> selectedIds = new HashSet<string>();
+        private string[] previousIds;
+        private bool previousClipSelection;
+        private int previousTrack;
+        private long previousFrom, previousTo, previousPlayhead;
+        private sealed class RegionVisual { public TimelineRegion Region; public Rectangle Body, Glow; }
+        private readonly List<RegionVisual> regionVisuals = new List<RegionVisual>();
         private readonly Button compactOptionsButton;
         private FrameworkElement exportDetails;
         private bool compactOptions;
@@ -73,7 +87,7 @@ namespace DrumBuddy
         private double pixelsPerSecond = 40;
         private long playhead, from, to;
         private bool updating, disposed, dirty, tempoEdited;
-        public bool IsBusy { get { return operation != null || recording; } }
+        public bool IsBusy { get { return operation != null || recording || clipDrag != ClipDrag.None; } }
         public bool Dirty { get { return dirty; } }
         private bool AllTracks { get { return scope.SelectedIndex == 1; } }
 
@@ -99,11 +113,9 @@ namespace DrumBuddy
             editing.Children.Add(WorkspaceUi.Button("Record options", delegate { ShowRecordingOptions(!recordingPane.IsPaneVisible); }));
             undoButton = WorkspaceUi.Button("Undo", delegate { Undo(false); }); editing.Children.Add(undoButton);
             redoButton = WorkspaceUi.Button("Redo", delegate { Undo(true); }); editing.Children.Add(redoButton);
-            editing.Children.Add(WorkspaceUi.Button("✂ Split", delegate { Split(); }));
-            scissorsTool = new ToggleButton { Content = "Scissors tool", MinHeight = 30, Padding = new Thickness(7, 3, 7, 3), FontSize = 12, Margin = new Thickness(0, 0, 6, 6), ToolTip = "Click a clip to split it. S splits at the playhead; K toggles this tool by default." }; editing.Children.Add(scissorsTool);
             editing.Children.Add(WorkspaceUi.Button("Delete range", delegate { DeleteRange(); }));
             scope = new ComboBox { ItemsSource = new[] { "Selected track", "All 16 tracks" }, SelectedIndex = 0, Width = 170, MinHeight = 36, FontSize = 14, Padding = new Thickness(6, 3, 6, 3), Margin = new Thickness(0, 0, 8, 8) }; editing.Children.Add(scope);
-            scope.SelectionChanged += delegate { DrawCanvas(); };
+            scope.SelectionChanged += delegate { if (!updating) { clipSelection = false; selectedIds.Clear(); } DrawCanvas(); };
             separate = new CheckBox { Content = "Import files on separate tracks", IsChecked = true, FontSize = 14, Margin = new Thickness(4, 0, 0, 8), VerticalAlignment = VerticalAlignment.Center }; editing.Children.Add(separate);
             compactOptionsButton = WorkspaceUi.Button("Audio / export options", delegate { compactOptions = !compactOptions; UpdateCompactLayout(); }); editing.Children.Add(compactOptionsButton);
 
@@ -128,23 +140,33 @@ namespace DrumBuddy
 
             var range = new WrapPanel { Margin = new Thickness(0, 0, 0, 5) }; tools.Children.Add(range);
             range.Visibility = Visibility.Collapsed;
-            editing.Children.Add(WorkspaceUi.Button("Range / zoom", delegate { range.Visibility = range.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible; }));
+            editing.Children.Add(WorkspaceUi.Button("Range", delegate { range.Visibility = range.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible; }));
             range.Children.Add(WorkspaceUi.Text("Selection, seconds  ", 14));
             selectionFrom = new TextBox { Text = "0.00000", Width = 100, FontSize = 15, Padding = new Thickness(5), Margin = new Thickness(0, 0, 8, 8) }; range.Children.Add(selectionFrom);
             range.Children.Add(WorkspaceUi.Text("to  ", 14));
             selectionTo = new TextBox { Text = "0.00000", Width = 100, FontSize = 15, Padding = new Thickness(5), Margin = new Thickness(0, 0, 8, 8) }; range.Children.Add(selectionTo);
-            range.Children.Add(WorkspaceUi.Button("Set range", delegate { if (ReadSelection()) { playhead = from; DrawCanvas(); } }));
-            range.Children.Add(WorkspaceUi.Text("Zoom  ", 14));
-            zoom = new ComboBox { ItemsSource = ZoomLevels.Select(v => v + " px/s").ToArray(), SelectedIndex = 3, Width = 115, MinHeight = 36, FontSize = 14, Padding = new Thickness(4), Margin = new Thickness(0, 0, 8, 8) };
-            zoom.SelectionChanged += delegate { if (!updating && zoom.SelectedIndex >= 0) { pixelsPerSecond = ZoomLevels[zoom.SelectedIndex]; DrawCanvas(); EnsurePlayheadVisible(); } }; range.Children.Add(zoom);
+            range.Children.Add(WorkspaceUi.Button("Set range", delegate { if (ReadSelection()) { clipSelection = false; selectedIds.Clear(); playhead = from; DrawCanvas(); } }));
             selectionText = WorkspaceUi.Text("Drag the upper ruler to move the playhead. Drag across a track to select time; blue handles adjust the range. Home goes to the start.", 13); selectionText.Foreground = WorkspaceUi.Color("#526771"); selectionText.Margin = new Thickness(0, 0, 0, 8); tools.Children.Add(selectionText);
 
+            tools.Children.Remove(selectionText);
+            var viewControls = new DockPanel { LastChildFill = true, Margin = new Thickness(0, 0, 0, 3) }; tools.Children.Add(viewControls);
+            var zoomTools = new StackPanel { Orientation = Orientation.Horizontal, Name = "EditorZoomControls" }; DockPanel.SetDock(zoomTools, Dock.Right); viewControls.Children.Add(zoomTools);
+            zoomTools.Children.Add(WorkspaceUi.Text("Zoom ", 12));
+            var zoomOut = WorkspaceUi.Button("-", delegate { ZoomStep(.5); }); zoomOut.Name = "EditorZoomOut"; zoomOut.Width = 28; zoomOut.MinHeight = 26; zoomOut.Padding = new Thickness(4, 1, 4, 1); zoomOut.ToolTip = "Zoom out (Ctrl+-)"; zoomTools.Children.Add(zoomOut);
+            zoomSlider = new Slider { Minimum = Math.Log(TimelineZoom.Minimum, 2), Maximum = Math.Log(TimelineZoom.Maximum, 2), Value = Math.Log(pixelsPerSecond, 2), Width = 96, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 6, 6), IsMoveToPointEnabled = true, ToolTip = "Timeline zoom" };
+            zoomSlider.ValueChanged += delegate { if (!updatingZoom) SetZoom(Math.Pow(2, zoomSlider.Value), ZoomAnchor()); }; zoomTools.Children.Add(zoomSlider);
+            var zoomIn = WorkspaceUi.Button("+", delegate { ZoomStep(2); }); zoomIn.Name = "EditorZoomIn"; zoomIn.Width = 28; zoomIn.MinHeight = 26; zoomIn.Padding = new Thickness(4, 1, 4, 1); zoomIn.ToolTip = "Zoom in (Ctrl+=)"; zoomTools.Children.Add(zoomIn);
+            zoomSpan = WorkspaceUi.Text("", 12); zoomSpan.Width = 72; zoomSpan.Margin = new Thickness(0, 0, 6, 6); zoomSpan.TextAlignment = TextAlignment.Right; zoomSpan.TextWrapping = TextWrapping.NoWrap; zoomTools.Children.Add(zoomSpan);
+            var fitProject = WorkspaceUi.Button("Fit", delegate { FitZoom(false); }); fitProject.Name = "EditorZoomFit"; fitProject.MinHeight = 26; fitProject.Padding = new Thickness(7, 1, 7, 1); fitProject.ToolTip = "Fit project (Ctrl+0)"; zoomTools.Children.Add(fitProject);
+            fitSelection = WorkspaceUi.Button("Selection", delegate { FitZoom(true); }); fitSelection.Name = "EditorZoomSelection"; fitSelection.MinHeight = 26; fitSelection.Padding = new Thickness(7, 1, 7, 1); fitSelection.ToolTip = "Fit selected time range (Ctrl+Shift+0)"; zoomTools.Children.Add(fitSelection);
+            selectionText.Margin = new Thickness(0, 0, 8, 6); selectionText.TextWrapping = TextWrapping.NoWrap; viewControls.Children.Add(selectionText);
+
             var body = new Grid { Background = WorkspaceUi.Color("#FFFFFF") }; SetRow(body, 2); editorBody.Children.Add(body);
             body.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(180) }); body.ColumnDefinitions.Add(new ColumnDefinition());
             headers = new StackPanel();
             headerScroll = new ScrollViewer { Content = headers, VerticalScrollBarVisibility = ScrollBarVisibility.Hidden, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled };
             body.Children.Add(headerScroll);
-            timeline = new Canvas { Background = WorkspaceUi.Color("#F7FAF9"), ClipToBounds = true, Cursor = Cursors.Cross, Focusable = true };
+            timeline = new Canvas { Background = WorkspaceUi.Color("#F7FAF9"), ClipToBounds = true, Cursor = Cursors.Arrow, Focusable = true };
             playLine = new Line { Stroke = WorkspaceUi.Color("#D0772C"), StrokeThickness = 2, IsHitTestVisible = false };
             selectionOverlay = new Rectangle { Fill = WorkspaceUi.Color("#5596C8"), Opacity = .2, IsHitTestVisible = false };
             selectionStartLine = new Line { Stroke = WorkspaceUi.Color("#277FA5"), StrokeThickness = 1.15, IsHitTestVisible = false };
@@ -153,18 +175,29 @@ namespace DrumBuddy
             scroll = new ScrollViewer { Content = timeline, HorizontalScrollBarVisibility = ScrollBarVisibility.Auto, VerticalScrollBarVisibility = ScrollBarVisibility.Auto, CanContentScroll = false };
             SetColumn(scroll, 1); body.Children.Add(scroll);
             scroll.ScrollChanged += delegate(object sender, ScrollChangedEventArgs e) { headerScroll.ScrollToVerticalOffset(scroll.VerticalOffset); if (Math.Abs(e.HorizontalChange) > .01 || Math.Abs(e.ViewportWidthChange) > .01) DrawCanvas(); };
+            scroll.PreviewMouseWheel += delegate(object sender, MouseWheelEventArgs e) {
+                if ((Keyboard.Modifiers & ModifierKeys.Control) != 0) {
+                    if (gesture.Mode == TimelineDrag.None) SetZoom(pixelsPerSecond * Math.Pow(2, e.Delta / 480.0), e.GetPosition(scroll).X);
+                    e.Handled = true;
+                }
+                else if ((Keyboard.Modifiers & ModifierKeys.Shift) != 0) { manualViewUntil = DateTime.UtcNow.AddSeconds(2); scroll.ScrollToHorizontalOffset(scroll.HorizontalOffset - e.Delta); e.Handled = true; }
+            };
             headerScroll.PreviewMouseWheel += delegate(object sender, MouseWheelEventArgs e) { scroll.ScrollToVerticalOffset(scroll.VerticalOffset - e.Delta); e.Handled = true; };
             timeline.MouseLeftButtonDown += BeginSelection;
             timeline.MouseMove += delegate(object sender, MouseEventArgs e) {
-                if (gesture.Mode == TimelineDrag.None) return;
-                gesture.Move(PointerFrame(e.GetPosition(timeline).X)); ApplyGesture();
+                var point = e.GetPosition(timeline);
+                if (clipDrag != ClipDrag.None) { PreviewClipDrag(point); return; }
+                if (gesture.Mode == TimelineDrag.None) { UpdateClipCursor(point); return; }
+                MovePointer(point.X);
             };
             timeline.MouseLeftButtonUp += delegate(object sender, MouseButtonEventArgs e) {
+                if (clipDrag != ClipDrag.None) { PreviewClipDrag(e.GetPosition(timeline)); FinishClipDrag(); timeline.ReleaseMouseCapture(); e.Handled = true; return; }
                 if (gesture.Mode == TimelineDrag.None) return;
-                gesture.End(PointerFrame(e.GetPosition(timeline).X)); ApplyGesture(); DrawCanvas(); timeline.ReleaseMouseCapture(); e.Handled = true;
+                EndPointer(e.GetPosition(timeline).X); timeline.ReleaseMouseCapture(); e.Handled = true;
             };
-            timeline.LostMouseCapture += delegate { if (gesture.Mode != TimelineDrag.None) { gesture.Finish(); ApplyGesture(); } };
+            timeline.LostMouseCapture += delegate { if (clipDrag != ClipDrag.None) CancelClipDrag(); if (gesture.Mode != TimelineDrag.None) { gesture.Finish(); ApplyGesture(); RefreshClipBounds(); DrawCanvas(); } };
 
+            InitializeClipTools(editing);
             var bottom = new StackPanel { Margin = new Thickness(0, 12, 0, 0) }; SetRow(bottom, 3); editorBody.Children.Add(bottom);
             var transport = new WrapPanel(); bottom.Children.Add(transport);
             play = WorkspaceUi.Button("Play", delegate { PlayPause(); }); play.MinWidth = 90; transport.Children.Add(play);
@@ -182,9 +215,11 @@ namespace DrumBuddy
             protect = new CheckBox { Content = "Prevent clipping (PCM)", IsChecked = true, FontSize = 14, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 15, 0) }; exports.Children.Add(protect);
             selectionOnly = new CheckBox { Content = "Selection only", FontSize = 14, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 15, 0) }; exports.Children.Add(selectionOnly);
             AddFileButton(exports, "Export mix…", async delegate { await ExportMix(); });
+            ArrangeCompactChrome(top, editing, range, viewControls, zoomTools, bottom, transport, exports);
             timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(80) };
-            timer.Tick += delegate { if (output.Playing || output.Paused) { playhead = (long)Math.Round(output.Position * Audio.Rate); UpdateTransport(); UpdatePlayLine(); if (output.Playing) EnsurePlayheadVisible(); } }; timer.Start();
-            BuildHeaders(); DrawCanvas();
+            timer.Tick += delegate { if (output.Playing || output.Paused) { playhead = (long)Math.Round(output.Position * Audio.Rate); UpdateTransport(); UpdatePlayLine(); if (output.Playing && DateTime.UtcNow >= manualViewUntil) EnsurePlayheadVisible(); } }; timer.Start();
+            waveformDetail = new WaveformDetail(Dispatcher, delegate { if (!disposed) DrawCanvas(); });
+            UpdateSelectionText(); BuildHeaders(); DrawCanvas();
             recordingPane = new DockablePane(editorBody, null, "Record options", false, false, 260) { MinimumMainHeight = 300 }; Children.Add(recordingPane);
             editorBody.SizeChanged += delegate { UpdateCompactLayout(); };
         }
@@ -193,11 +228,14 @@ namespace DrumBuddy
         {
             double width = editorBody.ActualWidth > 0 ? editorBody.ActualWidth : 1280;
             bool compact = width < 1000 || (editorBody.ActualHeight > 0 && editorBody.ActualHeight < 480);
-            compactOptionsButton.Visibility = compact ? Visibility.Visible : Visibility.Collapsed;
-            outputPicker.Visibility = exportDetails.Visibility = separate.Visibility = compact && !compactOptions ? Visibility.Collapsed : Visibility.Visible;
+            compactOptionsButton.Visibility = Visibility.Visible;
+            outputPicker.Visibility = separate.Visibility = Visibility.Visible;
+            exportDetails.Visibility = compactOptions ? Visibility.Visible : Visibility.Collapsed;
             gridTriplet.Visibility = rulerMode.Visibility = meterText.Visibility = compact ? Visibility.Collapsed : Visibility.Visible;
-            title.FontSize = compact ? 20 : 24;
-            selectionText.TextWrapping = compact ? TextWrapping.NoWrap : TextWrapping.Wrap;
+            title.FontSize = 14;
+            zoomSpan.Visibility = width < 700 ? Visibility.Collapsed : Visibility.Visible;
+            zoomSlider.Width = width < 700 ? 64 : 80;
+            selectionText.TextWrapping = TextWrapping.NoWrap;
             selectionText.TextTrimming = TextTrimming.CharacterEllipsis;
         }
 
@@ -246,13 +284,46 @@ namespace DrumBuddy
         private long FrameAt(double x) { return Math.Max(0, Math.Min(EditorSession.MaxFrame, (long)Math.Round(x / pixelsPerSecond * Audio.Rate))); }
         private long PointerFrame(double x)
         { return TimelineGesture.FrameAt(x, pixelsPerSecond, session.Regions.SelectMany(r => new[] { r.Start, r.End }), (Keyboard.Modifiers & ModifierKeys.Alt) != 0, session.Grid, InterfacePreferences.Current.SnapToGrid, InterfacePreferences.Current.SnapToEdges); }
-        private void ApplyGesture() { playhead = gesture.Playhead; from = gesture.From; to = gesture.To; UpdateSelectionText(); UpdateSelectionOverlay(); UpdatePlayLine(); UpdateTransport(); }
+        private void ApplyGesture() { playhead = gesture.Playhead; from = gesture.From; to = gesture.To; UpdateSelectionText(); UpdateSelectionOverlay(); RefreshRegionHighlights(); UpdatePlayLine(); UpdateTransport(); }
         private double X(long frame) { return frame / (double)Audio.Rate * pixelsPerSecond; }
+        private double ViewportWidth { get { return scroll != null && scroll.ViewportWidth > 0 ? scroll.ViewportWidth : 900; } }
+        private double ZoomAnchor()
+        {
+            double x = X(playhead) - scroll.HorizontalOffset;
+            return x >= 0 && x <= ViewportWidth ? x : ViewportWidth / 2;
+        }
+        private void ZoomStep(double factor) { SetZoom(pixelsPerSecond * factor, ZoomAnchor()); }
+        private void SetZoom(double value, double pointer)
+        {
+            if (scroll == null || gesture.Mode != TimelineDrag.None || clipDrag != ClipDrag.None || disposed) return;
+            double scale = TimelineZoom.Clamp(value), at = Math.Max(0, Math.Min(ViewportWidth, pointer));
+            double offset = TimelineZoom.Offset(pixelsPerSecond, scale, scroll.HorizontalOffset, at);
+            pixelsPerSecond = scale; manualViewUntil = DateTime.UtcNow.AddSeconds(2);
+            DrawCanvas(); scroll.UpdateLayout(); scroll.ScrollToHorizontalOffset(offset); scroll.UpdateLayout(); DrawCanvas();
+        }
+        private void FitZoom(bool selected)
+        {
+            if (gesture.Mode != TimelineDrag.None) return;
+            if (selected && to <= from) return;
+            long start = selected ? from : 0, end = selected ? to : session.End > 0 ? session.End : Audio.Rate * 15L;
+            SetZoom(TimelineZoom.Fit(end - start, ViewportWidth), 0);
+            scroll.ScrollToHorizontalOffset(Math.Max(0, X(start) - 16)); scroll.UpdateLayout(); DrawCanvas();
+        }
+        private void RefreshZoomControls()
+        {
+            updatingZoom = true; zoomSlider.Value = Math.Log(pixelsPerSecond, 2); updatingZoom = false;
+            double span = ViewportWidth / pixelsPerSecond;
+            zoomSpan.Text = span >= 3600 ? (span / 3600).ToString("0.#", CultureInfo.InvariantCulture) + " h" : span >= 60 ? (span / 60).ToString("0.#", CultureInfo.InvariantCulture) + " min" : span < 1 ? (span * 1000).ToString("0.##", CultureInfo.InvariantCulture) + " ms" : span.ToString("0.##", CultureInfo.InvariantCulture) + " s";
+            fitSelection.IsEnabled = to > from;
+        }
         private void UpdateSelectionText()
         {
             selectionFrom.Text = (from / (double)Audio.Rate).ToString("0.00000", CultureInfo.InvariantCulture);
             selectionTo.Text = (to / (double)Audio.Rate).ToString("0.00000", CultureInfo.InvariantCulture);
             selectionText.Text = "Track " + (track + 1) + " | Selection " + (from / (double)Audio.Rate).ToString("0.00000", CultureInfo.InvariantCulture) + " – " + (to / (double)Audio.Rate).ToString("0.00000", CultureInfo.InvariantCulture) + " s";
+            if (fitSelection != null) fitSelection.IsEnabled = to > from;
+            if (clipSelection) selectionText.Text = selectedIds.Count == 1 ? "1 clip selected" : selectedIds.Count + " clips selected";
+            selectionText.Visibility = to > from || clipSelection ? Visibility.Visible : Visibility.Collapsed;
         }
         private bool ReadSelection()
         {
@@ -265,24 +336,75 @@ namespace DrumBuddy
         }
         private void BeginSelection(object sender, MouseButtonEventArgs e)
         {
-            if (IsBusy) return; Stop(); timeline.Focus(); var point = e.GetPosition(timeline); long frame = PointerFrame(point.X);
+            if (IsBusy) return; Stop(); timeline.Focus();
+            BeginPointer(e.GetPosition(timeline), (Keyboard.Modifiers & ModifierKeys.Shift) != 0, e.ClickCount);
+            if (gesture.Mode != TimelineDrag.None || clipDrag != ClipDrag.None) timeline.CaptureMouse(); e.Handled = true;
+        }
+        private void BeginPointer(Point point, bool additive, int clicks)
+        {
+            previousIds = selectedIds.ToArray(); previousClipSelection = clipSelection; previousTrack = track;
+            previousFrom = from; previousTo = to; previousPlayhead = playhead;
+            long frame = PointerFrame(point.X); pendingRegion = null; selectionMoved = false;
             if (point.Y < RulerHeight) {
                 var mode = TimelineGesture.RulerHit(point.X, point.Y, X(from), X(to), to > from);
-                gesture.Begin(mode, frame, playhead, from, to); ApplyGesture(); timeline.CaptureMouse(); e.Handled = true; return;
+                if (mode != TimelineDrag.Playhead) { clipSelection = false; selectedIds.Clear(); }
+                gesture.Begin(mode, frame, playhead, from, to); ApplyGesture(); return;
             }
             track = Math.Max(0, Math.Min(15, (int)((point.Y - RulerHeight) / RowHeight)));
-            if (scissorsTool.IsChecked == true) {
-                playhead = frame;
-                Change(delegate { int before = session.Regions.Count; TimelineEdits.Split(session, track, false, frame); return session.Regions.Count != before; }, "Audio split at the cursor.");
-                DrawCanvas(); e.Handled = true; return;
+            var region = RegionAt(point);
+            if (sliceCursor) { playhead = frame; Change(() => TimelineEdits.Split(session, track, false, frame), "Split at the cursor."); return; }
+            if (region != null && !additive && clicks == 1) { var tool = ClipToolAt(region, point); if (tool != ClipDrag.None) { BeginClipDrag(tool, region, point); return; } }
+            if (additive && region != null) { playhead = frame; SelectRegion(region, true); BuildHeaders(); DrawCanvas(); return; }
+            if (clicks == 2 && region != null) { playhead = region.Start; SelectRegion(region, false); BuildHeaders(); DrawCanvas(); return; }
+            selectionPointerX = point.X; pendingRegion = region == null ? null : region.Id;
+            selectedIds.Clear(); clipSelection = region != null; if (region != null) selectedIds.Add(region.Id);
+            gesture.Begin(TimelineDrag.Selection, frame, playhead, from, to); gesture.Playhead = frame;
+            ApplyGesture(); BuildHeaders(); DrawCanvas();
+        }
+        private void MovePointer(double x)
+        {
+            if (gesture.Mode == TimelineDrag.Selection && Math.Abs(x - selectionPointerX) >= 3) {
+                if (!selectionMoved) { selectionMoved = true; clipSelection = false; selectedIds.Clear(); DrawCanvas(); }
             }
-            if (e.ClickCount == 2) {
-                long rawFrame = FrameAt(point.X);
-                var region = session.Regions.LastOrDefault(r => r.Track == track && r.Start <= rawFrame && r.End > rawFrame);
-                if (region != null) { from = playhead = region.Start; to = region.End; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); e.Handled = true; return; }
+            gesture.Move(PointerFrame(x)); ApplyGesture();
+        }
+        private void EndPointer(double x)
+        {
+            var mode = gesture.Mode; MovePointer(x); gesture.End(PointerFrame(x)); ApplyGesture();
+            if (mode == TimelineDrag.Selection && !selectionMoved && pendingRegion != null) {
+                var region = session.Regions.FirstOrDefault(r => r.Id == pendingRegion); if (region != null) SelectRegion(region, false);
             }
-            gesture.Begin(TimelineDrag.Selection, frame, playhead, from, to); ApplyGesture();
-            timeline.CaptureMouse(); UpdateSelectionText(); BuildHeaders(); DrawCanvas(); e.Handled = true;
+            else if (mode == TimelineDrag.Selection && to > from) playhead = from;
+            pendingRegion = null; UpdateSelectionText(); BuildHeaders(); DrawCanvas();
+        }
+        private void SelectRegion(TimelineRegion region, bool additive)
+        {
+            if (!additive) selectedIds.Clear();
+            if (!selectedIds.Add(region.Id)) selectedIds.Remove(region.Id);
+            clipSelection = selectedIds.Count > 0;
+            var selected = session.Regions.Where(r => selectedIds.Contains(r.Id)).ToArray();
+            from = selected.Length == 0 ? playhead : selected.Min(r => r.Start);
+            to = selected.Length == 0 ? playhead : selected.Max(r => r.End); UpdateSelectionText();
+        }
+        private bool RegionSelected(TimelineRegion region)
+        { return clipSelection ? selectedIds.Contains(region.Id) : to > from && region.Start < to && region.End > from && (AllTracks || region.Track == track); }
+        private void RefreshRegionHighlights()
+        {
+            foreach (var visual in regionVisuals) {
+                bool selected = RegionSelected(visual.Region), muted = visual.Region.Muted || session.Tracks[visual.Region.Track].Mute;
+                visual.Body.Fill = WorkspaceUi.Color(selected ? "#DAD5FA" : muted ? "#CBD8D4" : "#B9DDD2");
+                visual.Body.Stroke = WorkspaceUi.Color(selected ? "#7359C7" : "#5E9D89");
+                visual.Body.StrokeThickness = selected ? 1.7 : 1; visual.Body.Tag = selected ? "SelectedRegion" : null;
+                visual.Glow.Visibility = selected ? Visibility.Visible : Visibility.Collapsed;
+            }
+        }
+        private void RefreshClipBounds()
+        {
+            if (!clipSelection) return;
+            var picked = session.Regions.Where(r => selectedIds.Contains(r.Id)).ToArray();
+            if (picked.Length == 0) { selectedIds.Clear(); clipSelection = false; from = to = playhead; }
+            else { from = picked.Min(r => r.Start); to = picked.Max(r => r.End); if (!picked.Any(r => r.Track == track)) track = picked[0].Track; }
+            UpdateSelectionText();
         }
         private void BuildHeaders()
         {
@@ -309,34 +431,30 @@ namespace DrumBuddy
         }
         private void DrawCanvas()
         {
-            if (timeline == null) return;
-            timeline.Children.Clear(); timeline.Height = RulerHeight + RowHeight * 16;
+            if (timeline == null || disposed) return;
+            timeline.Children.Clear(); regionVisuals.Clear(); timeline.Height = RulerHeight + RowHeight * 16;
             timeline.Width = Math.Max(Math.Max(900, scroll.ViewportWidth), X(Math.Max(session.End, Math.Max(to, playhead)) + Audio.Rate * 15L));
             double left = scroll.HorizontalOffset, right = left + Math.Max(900, scroll.ViewportWidth);
+            waveformDetail.BeginView(left.ToString("R", CultureInfo.InvariantCulture) + "|" + right.ToString("R", CultureInfo.InvariantCulture) + "|" + pixelsPerSecond.ToString("R", CultureInfo.InvariantCulture));
             for (int i = 0; i < 16; i++) {
                 var row = new Rectangle { Width = Math.Max(900, scroll.ViewportWidth), Height = RowHeight, Fill = WorkspaceUi.Color(i == track ? "#F0F8F5" : i % 2 == 0 ? "#FCFDFC" : "#F4F8F6"), Stroke = WorkspaceUi.Color("#E0E8E5"), StrokeThickness = .5, IsHitTestVisible = false };
                 Canvas.SetLeft(row, left); Canvas.SetTop(row, RulerHeight + i * RowHeight); timeline.Children.Add(row);
             }
             foreach (var region in session.Regions.Where(r => X(r.End) >= left && X(r.Start) <= right)) DrawRegion(region, left, right);
             RefreshGridToolbar();
+            RefreshZoomControls();
+            bool visibleLabel = false;
             if (session.Grid.MusicalRuler) foreach (var tick in TempoGrid.VisibleTicks(session.Grid, left, right - left, pixelsPerSecond)) {
                 double x = X(tick.Frame);
                 timeline.Children.Add(new Line { X1 = x, X2 = x, Y1 = tick.Kind == 0 ? RulerHeight : 0, Y2 = timeline.Height,
                     Stroke = WorkspaceUi.Color(tick.Kind == 2 ? "#386BA8" : tick.Kind == 1 ? "#D6E1DF" : "#E0E8E5"), Opacity = tick.Kind == 2 ? .48 : tick.Kind == 1 ? .7 : .45, StrokeThickness = tick.Kind == 2 ? 1 : .5, IsHitTestVisible = false });
-                if (tick.Label != null) { var label = WorkspaceUi.Text(tick.Label, 11); label.IsHitTestVisible = false; Canvas.SetLeft(label, x + 4); Canvas.SetTop(label, 3); timeline.Children.Add(label); }
-            }
-            else {
-            double spacing = pixelsPerSecond >= 80 ? 1 : pixelsPerSecond >= 20 ? 5 : 10;
-            for (double second = Math.Floor(left / pixelsPerSecond / spacing) * spacing; second * pixelsPerSecond < right; second += spacing) {
-                double x = second * pixelsPerSecond;
-                var line = new Line { X1 = x, X2 = x, Y1 = 0, Y2 = timeline.Height, Stroke = WorkspaceUi.Color("#DAE5E0"), StrokeThickness = 1, IsHitTestVisible = false }; timeline.Children.Add(line);
-                var label = WorkspaceUi.Text(WorkspaceUi.Clock(second), 11); label.IsHitTestVisible = false; Canvas.SetLeft(label, x + 4); Canvas.SetTop(label, 3); timeline.Children.Add(label);
-            }
+                if (tick.Label != null) { if (x >= left && x < left + ViewportWidth) visibleLabel = true; var label = WorkspaceUi.Text(tick.Label, 11); label.IsHitTestVisible = false; Canvas.SetLeft(label, x + 4); Canvas.SetTop(label, 3); timeline.Children.Add(label); }
             }
+            if (!session.Grid.MusicalRuler || !visibleLabel) DrawTimeRuler(left, right);
             timeline.Children.Add(selectionOverlay); timeline.Children.Add(selectionStartLine); timeline.Children.Add(selectionEndLine); timeline.Children.Add(selectionStartHandle); timeline.Children.Add(selectionEndHandle); UpdateSelectionOverlay();
             playLine.Y1 = 0; playLine.Y2 = timeline.Height; timeline.Children.Add(playLine); UpdatePlayLine(); UpdateTransport();
             undoButton.IsEnabled = !IsBusy && undo.Count > 0; redoButton.IsEnabled = !IsBusy && redo.Count > 0;
-            title.Text = "Editor · " + session.Name + (dirty ? " *" : "");
+            title.Text = session.Name + (dirty ? " *" : "");
         }
         private void UpdateSelectionOverlay()
         {
@@ -345,10 +463,21 @@ namespace DrumBuddy
             foreach (var item in new UIElement[] { selectionOverlay, selectionStartLine, selectionEndLine, selectionStartHandle, selectionEndHandle }) item.Visibility = visibility;
             if (to <= from) return;
             double left = scroll.HorizontalOffset, right = left + Math.Max(900, scroll.ViewportWidth), a = Math.Max(left, X(from)), b = Math.Min(right, X(to));
+            if (clipSelection) selectionOverlay.Visibility = Visibility.Collapsed;
             selectionOverlay.Width = Math.Max(0, b - a); selectionOverlay.Height = AllTracks ? RowHeight * 16 : RowHeight;
             Canvas.SetLeft(selectionOverlay, a); Canvas.SetTop(selectionOverlay, RulerHeight + (AllTracks ? 0 : track * RowHeight));
             UpdateRangeStick(selectionStartLine, selectionStartHandle, X(from), true); UpdateRangeStick(selectionEndLine, selectionEndHandle, X(to), false);
         }
+        private void DrawTimeRuler(double left, double right)
+        {
+            double spacing = TimelineZoom.SecondStep(pixelsPerSecond);
+            for (double second = Math.Floor(left / pixelsPerSecond / spacing) * spacing; second * pixelsPerSecond < right; second += spacing) {
+                double x = second * pixelsPerSecond;
+                timeline.Children.Add(new Line { X1 = x, X2 = x, Y1 = 0, Y2 = timeline.Height, Stroke = WorkspaceUi.Color("#DAE5E0"), StrokeThickness = .6, Opacity = .65, IsHitTestVisible = false });
+                string time = spacing >= 1 ? WorkspaceUi.Clock(second) : second.ToString("F" + Math.Max(1, (int)Math.Ceiling(-Math.Log10(spacing))), CultureInfo.InvariantCulture) + " s";
+                var label = WorkspaceUi.Text(time, 11); label.IsHitTestVisible = false; Canvas.SetLeft(label, x + 4); Canvas.SetTop(label, 3); timeline.Children.Add(label);
+            }
+        }
         private void UpdateRangeStick(Line line, Polygon handle, double x, bool start)
         {
             line.X1 = line.X2 = x; line.Y1 = 14; line.Y2 = timeline.Height;
@@ -357,26 +486,34 @@ namespace DrumBuddy
         private void DrawRegion(TimelineRegion region, double left, double right)
         {
             double x = Math.Max(left, X(region.Start)), end = Math.Min(right, X(region.End)), y = RulerHeight + region.Track * RowHeight + 3;
-            double width = Math.Max(2, end - x); bool muted = session.Tracks[region.Track].Mute;
-            var rectangle = new Rectangle { Width = width, Height = RowHeight - 6, RadiusX = 5, RadiusY = 5, Fill = WorkspaceUi.Color(muted ? "#CBD8D4" : "#B9DDD2"), Stroke = WorkspaceUi.Color("#5E9D89"), StrokeThickness = 1, IsHitTestVisible = false };
+            double width = Math.Max(2, end - x); bool muted = region.Muted || session.Tracks[region.Track].Mute, selected = RegionSelected(region);
+            var rectangle = new Rectangle { Width = width, Height = RowHeight - 6, RadiusX = 5, RadiusY = 5, Fill = WorkspaceUi.Color(selected ? "#DAD5FA" : muted ? "#CBD8D4" : "#B9DDD2"), Stroke = WorkspaceUi.Color(selected ? "#7359C7" : "#5E9D89"), StrokeThickness = selected ? 1.7 : 1, Tag = selected ? "SelectedRegion" : null, IsHitTestVisible = false };
+            var glow = new Rectangle { Width = width + 2, Height = RowHeight - 4, RadiusX = 6, RadiusY = 6, Stroke = WorkspaceUi.Color("#7359C7"), StrokeThickness = 4, Opacity = .28, IsHitTestVisible = false, Visibility = selected ? Visibility.Visible : Visibility.Collapsed }; Canvas.SetLeft(glow, x - 1); Canvas.SetTop(glow, y - 1); timeline.Children.Add(glow);
             Canvas.SetLeft(rectangle, x); Canvas.SetTop(rectangle, y); timeline.Children.Add(rectangle);
+            regionVisuals.Add(new RegionVisual { Region = region, Body = rectangle, Glow = glow });
             Clip clip;
             if (assets.TryGetValue(region.Source, out clip) && clip.Waveform != null && width > 2) {
-                int points = Math.Max(2, Math.Min(400, (int)(width / 2))); var wave = new Polygon { Fill = WorkspaceUi.Color("#438B77"), Opacity = .7, IsHitTestVisible = false };
+                long sourceStart = region.SourceStart + (long)Math.Floor((x - X(region.Start)) / pixelsPerSecond * Audio.Rate);
+                long sourceEnd = Math.Min(region.SourceStart + region.Length, region.SourceStart + (long)Math.Ceiling((end - X(region.Start)) / pixelsPerSecond * Audio.Rate));
+                var detail = pixelsPerSecond * clip.Duration / clip.Waveform.Length > 1 ? waveformDetail.Get(clip.Cache, sourceStart, sourceEnd, Math.Max(2, Math.Min(2000, (int)Math.Ceiling(width)))) : null;
+                int points = detail == null ? Math.Max(2, Math.Min(400, (int)(width / 2))) : detail.Low.Length;
+                var wave = new Polygon { Fill = WorkspaceUi.Color("#438B77"), Stroke = detail == null ? null : WorkspaceUi.Color("#438B77"), StrokeThickness = .8, Opacity = .7, IsHitTestVisible = false, Tag = detail == null ? "WaveformOverview" : "WaveformDetail" };
                 double sourceFrames = Math.Max(1, clip.Duration * Audio.Rate), scale = Math.Max(1, clip.Peak);
                 for (int side = 0; side < 2; side++) for (int p = 0; p < points; p++) {
                     int j = side == 0 ? p : points - p - 1; double px = x + j * width / (points - 1);
                     double sourceFrame = region.SourceStart + (px - X(region.Start)) / pixelsPerSecond * Audio.Rate;
                     int bin = Math.Max(0, Math.Min(clip.Waveform.Length - 1, (int)(sourceFrame / sourceFrames * clip.Waveform.Length)));
-                    double amplitude = clip.Waveform[bin] / scale * RowHeight * .22;
-                    wave.Points.Add(new Point(px, y + RowHeight * .65 + (side == 0 ? -amplitude : amplitude)));
+                    double value = detail == null ? clip.Waveform[bin] * (side == 0 ? 1 : -1) : side == 0 ? detail.High[j] : detail.Low[j];
+                    value *= EditorTools.Envelope(region, (long)Math.Round(sourceFrame - region.SourceStart));
+                    wave.Points.Add(new Point(px, y + RowHeight * .65 - value / scale * RowHeight * .22));
                 }
                 timeline.Children.Add(wave);
             }
             if (width > 45) {
-                var label = WorkspaceUi.Text(region.Name, 12); label.MaxWidth = Math.Max(1, width - 10); label.TextWrapping = TextWrapping.NoWrap; label.TextTrimming = TextTrimming.CharacterEllipsis; label.IsHitTestVisible = false;
+                var label = WorkspaceUi.Text(region.Name + (region.Muted ? " · muted" : ""), 12); label.MaxWidth = Math.Max(1, width - 10); label.TextWrapping = TextWrapping.NoWrap; label.TextTrimming = TextTrimming.CharacterEllipsis; label.IsHitTestVisible = false;
                 Canvas.SetLeft(label, x + 5); Canvas.SetTop(label, y + 3); timeline.Children.Add(label);
             }
+            DrawClipFades(region, left, right, selected);
         }
         private void UpdatePlayLine() { playLine.X1 = playLine.X2 = X(playhead); }
         private void UpdateTransport()
@@ -387,29 +524,41 @@ namespace DrumBuddy
         private void Change(Func<bool> action, string message)
         {
             if (IsBusy) return; Stop(); var before = session.Copy();
+            var oldIds = selectedIds.ToArray(); bool oldMode = clipSelection; long oldFrom = from, oldTo = to; int oldTrack = track;
+            Action restore = delegate { session = before; selectedIds.Clear(); foreach (string id in oldIds) selectedIds.Add(id); clipSelection = oldMode; from = oldFrom; to = oldTo; track = oldTrack; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); };
             try {
-                if (!action()) { status("No audio section was changed. Select a clip or a time range first."); return; }
-                session.Validate(); undo.Push(before); redo.Clear(); dirty = true; BuildHeaders(); DrawCanvas(); status(message);
+                if (!action()) { restore(); status("No audio section was changed. Select a clip or a time range first."); return; }
+                session.Validate(); undo.Push(before); redo.Clear(); dirty = true; RefreshClipBounds(); BuildHeaders(); DrawCanvas(); status(message);
             }
-            catch (Exception ex) { session = before; BuildHeaders(); DrawCanvas(); status(ex.Message); }
+            catch (Exception ex) { restore(); status(ex.Message); }
         }
         private void Undo(bool forward)
         {
             if (IsBusy) return; var source = forward ? redo : undo; var target = forward ? undo : redo;
-            if (source.Count == 0) return; Stop(); target.Push(session.Copy()); session = source.Pop(); dirty = true; BuildHeaders(); DrawCanvas();
+            if (source.Count == 0) return; Stop(); target.Push(session.Copy()); session = source.Pop(); dirty = true; RefreshClipBounds(); BuildHeaders(); DrawCanvas();
         }
-        private void Split() { Change(() => TimelineEdits.Split(session, track, AllTracks, playhead), "Split at the playhead."); }
+        private void Split() { Change(() => TimelineEdits.Split(session, track, AllTracks, playhead, clipSelection ? selectedIds : null), "Split at the playhead."); }
         private void Copy(bool cut)
         {
-            if (IsBusy || !ReadSelection() || to <= from) { status("Select a time range to copy or cut."); return; }
-            clipboard = TimelineEdits.Copy(session, track, AllTracks, from, to);
+            RefreshClipBounds();
+            if (IsBusy || !ReadSelection() || to <= from) { status("Select a clip or time range to copy or cut."); return; }
+            bool all = clipSelection ? session.Regions.Where(r => selectedIds.Contains(r.Id)).Select(r => r.Track).Distinct().Count() > 1 : AllTracks;
+            clipboard = TimelineEdits.Copy(session, track, all, from, to, clipSelection ? selectedIds : null);
             if (clipboard.Regions.Count == 0) { status("There is no audio in this selection."); return; }
-            if (cut) Change(() => TimelineEdits.Delete(session, track, AllTracks, from, to), "Selection cut. Paste inserts it at the playhead.");
+            if (cut) Change(() => TimelineEdits.Delete(session, track, AllTracks, from, to, clipSelection ? selectedIds : null), "Selection cut. Paste inserts it at the playhead.");
             else status("Copied " + clipboard.Regions.Count + " audio section(s). Click the ruler for the paste position.");
         }
         private void DeleteRange()
-        { if (ReadSelection() && to > from) Change(() => TimelineEdits.Delete(session, track, AllTracks, from, to), "Selected audio removed; the timeline gap is kept."); }
-        private void Paste() { Change(() => TimelineEdits.Paste(session, clipboard, track, playhead), "Audio pasted at the playhead."); }
+        { if (ReadSelection() && to > from) Change(() => TimelineEdits.Delete(session, track, AllTracks, from, to, clipSelection ? selectedIds : null), "Selected audio removed; the timeline gap is kept."); }
+        private void Paste()
+        {
+            Change(delegate {
+                var before = new HashSet<string>(session.Regions.Select(r => r.Id));
+                if (!TimelineEdits.Paste(session, clipboard, track, playhead)) return false;
+                selectedIds.Clear(); foreach (var region in session.Regions.Where(r => !before.Contains(r.Id))) selectedIds.Add(region.Id);
+                clipSelection = true; return true;
+            }, "Audio pasted at the playhead.");
+        }
 
         private async Task ChooseAudio()
         {
@@ -442,7 +591,7 @@ namespace DrumBuddy
             }
             catch (OperationCanceledException) { status("Import cancelled. Your existing timeline is kept."); }
             catch (Exception ex) { status("Could not add audio: " + ex.Message); }
-            finally { EndWork(); BuildHeaders(); DrawCanvas(); }
+            finally { EndWork(); BuildHeaders(); DrawCanvas(); timeline.Focus(); }
         }
         private void BeginWork()
         { operation = new CancellationTokenSource(); foreach (var button in fileButtons) button.IsEnabled = false; play.IsEnabled = false; cancel.Visibility = Visibility.Visible; RefreshGridToolbar(); }
@@ -450,7 +599,7 @@ namespace DrumBuddy
         { operation.Dispose(); operation = null; foreach (var button in fileButtons) button.IsEnabled = true; play.IsEnabled = true; cancel.Visibility = Visibility.Collapsed; RefreshGridToolbar(); }
         private void NewSession()
         {
-            if (IsBusy || !ConfirmClose()) return; Stop(); session = new EditorSession { Grid = InterfacePreferences.Current.Grid.Copy() }; sessionPath = null; assets.Clear(); undo.Clear(); redo.Clear(); dirty = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas();
+            if (IsBusy || !ConfirmClose()) return; Stop(); session = new EditorSession { Grid = InterfacePreferences.Current.Grid.Copy() }; sessionPath = null; assets.Clear(); undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas();
         }
         public bool SaveSession(bool saveAs)
         {
@@ -479,7 +628,7 @@ namespace DrumBuddy
                 }
                 using (var verify = new TimelineMix(loaded, decoded)) { }
                 operation.Token.ThrowIfCancellationRequested(); session = loaded; assets.Clear(); foreach (var pair in decoded) assets.Add(pair.Key, pair.Value);
-                sessionPath = dialog.FileName; undo.Clear(); redo.Clear(); dirty = false; from = to = playhead = 0; UpdateSelectionText(); status("Editor session opened.");
+                sessionPath = dialog.FileName; undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); status("Editor session opened.");
             }
             catch (OperationCanceledException) { status("Opening cancelled. Your current timeline is kept."); }
             catch (Exception ex) { status("Could not open this session: " + ex.Message); }
@@ -563,12 +712,15 @@ namespace DrumBuddy
         }
         public async Task<bool> ExecuteAction(string action)
         {
-            if (IsBusy && action != "stop") return false;
+            if (action == "selectTool" && clipDrag != ClipDrag.None) CancelClipDrag();
+            if (IsBusy && action != "stop" && !action.StartsWith("zoom", StringComparison.Ordinal)) return false;
+            if (ExecuteClipAction(action)) return true;
             switch (action) {
                 case "play": PlayPause(); break;
                 case "stop": Stop(); UpdateTransport(); break;
                 case "split": Split(); break;
-                case "scissors": scissorsTool.IsChecked = scissorsTool.IsChecked != true; break;
+                case "selectTool": SetPointerTool("select"); break;
+                case "scissors": sliceCursor = !sliceCursor; timeline.Cursor = sliceCursor ? Cursors.Cross : Cursors.Arrow; break;
                 case "copy": Copy(false); break;
                 case "cut": Copy(true); break;
                 case "paste": Paste(); break;
@@ -583,14 +735,19 @@ namespace DrumBuddy
                 case "export": await ExportMix(); break;
                 case "start": Stop(); playhead = 0; DrawCanvas(); EnsurePlayheadVisible(); break;
                 case "end": Stop(); playhead = session.End; DrawCanvas(); EnsurePlayheadVisible(); break;
+                case "zoomIn": case "zoomInPlus": case "zoomInKeypad": ZoomStep(2); break;
+                case "zoomOut": case "zoomOutKeypad": ZoomStep(.5); break;
+                case "zoomFit": FitZoom(false); break;
+                case "zoomSelection": FitZoom(true); break;
                 default: return false;
             }
             return true;
         }
         public bool HandleKey(KeyEventArgs e)
         {
+            if (e.Key == Key.Escape && clipDrag != ClipDrag.None) { CancelClipDrag(); timeline.ReleaseMouseCapture(); return true; }
             if (Keyboard.FocusedElement is TextBox || Keyboard.FocusedElement is ComboBox) return false;
-            if (e.Key == Key.Escape && gesture.Mode != TimelineDrag.None) { gesture.Cancel(); ApplyGesture(); timeline.ReleaseMouseCapture(); return true; }
+            if (e.Key == Key.Escape && gesture.Mode != TimelineDrag.None) { gesture.Cancel(); selectedIds.Clear(); if (previousIds != null) foreach (string id in previousIds) selectedIds.Add(id); clipSelection = previousClipSelection; track = previousTrack; ApplyGesture(); BuildHeaders(); DrawCanvas(); timeline.ReleaseMouseCapture(); return true; }
             string action = InterfacePreferences.Resolve(e.Key == Key.System ? e.SystemKey : e.Key, Keyboard.Modifiers);
             if (action == null || action == "record") return false;
             var pending = ExecuteAction(action);
@@ -605,11 +762,26 @@ namespace DrumBuddy
             return choice == MessageBoxResult.No || (choice == MessageBoxResult.Yes && SaveSession(false));
         }
         internal void SetForTest(EditorSession state, IDictionary<string, Clip> decoded)
-        { session = state.Copy(); assets.Clear(); foreach (var p in decoded) assets.Add(p.Key, p.Value); undo.Clear(); redo.Clear(); dirty = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); }
+        { session = state.Copy(); assets.Clear(); foreach (var p in decoded) assets.Add(p.Key, p.Value); undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); }
         internal EditorSession SessionForTest { get { return session.Copy(); } }
-        internal void ShowSelectionForTest(long start, long end) { from = start; to = end; UpdateSelectionText(); DrawCanvas(); }
+        internal void ListenVolumeForTest(double value) { volume.Value = value; }
+        internal bool PlayingForTest { get { return output.Playing; } }
+        internal void ShowSelectionForTest(long start, long end) { clipSelection = false; selectedIds.Clear(); from = start; to = end; UpdateSelectionText(); DrawCanvas(); }
         internal void PlayheadForTest(long value) { playhead = value; DrawCanvas(); }
-        internal void ZoomForTest(double value) { pixelsPerSecond = value; DrawCanvas(); }
+        internal void ZoomForTest(double value) { SetZoom(value, 0); }
+        internal double ZoomPixelsForTest { get { return pixelsPerSecond; } }
+        internal double OffsetForTest { get { return scroll.HorizontalOffset; } }
+        internal double WidthForTest { get { return ViewportWidth; } }
+        internal int DetailsForTest { get { return timeline.Children.OfType<Polygon>().Count(p => (string)p.Tag == "WaveformDetail"); } }
+        internal void ZoomAtForTest(double value, double pointer) { SetZoom(value, pointer); }
+        internal void OffsetForTestSet(double value) { scroll.ScrollToHorizontalOffset(value); scroll.UpdateLayout(); DrawCanvas(); }
+        internal void PointerDownForTest(long frame, int targetTrack, bool additive) { BeginPointer(new Point(X(frame), RulerHeight + targetTrack * RowHeight + 20), additive, 1); }
+        internal void PointerUpForTest(long frame) { if (gesture.Mode != TimelineDrag.None) EndPointer(X(frame)); }
+        internal void PointerMoveForTest(long frame) { MovePointer(X(frame)); }
+        internal int SelectedClipsForTest { get { return clipSelection ? selectedIds.Count : 0; } }
+        internal int HighlightedForTest { get { return regionVisuals.Count(v => (string)v.Body.Tag == "SelectedRegion"); } }
+        internal bool SelectCursorForTest { get { return timeline.Cursor == Cursors.Arrow; } }
+        internal double TimelineHeightForTest { get { return scroll.ViewportHeight; } }
         internal bool CheckUndoRedoForTest()
         {
             var original = session.Copy();
@@ -620,7 +792,7 @@ namespace DrumBuddy
             return restored && repeated && dirty;
         }
         public void Dispose()
-        { if (disposed) return; disposed = true; if (operation != null) operation.Cancel(); timer.Stop(); Stop(); output.Dispose(); }
+        { if (disposed) return; disposed = true; waveformDetail.Dispose(); if (operation != null) operation.Cancel(); timer.Stop(); Stop(); output.Dispose(); }
         public void CancelWork() { if (operation != null) operation.Cancel(); }
     }
 }