diff --git a/src/client/spark/view/Controls/Adorners/DragRectAdorner.cs b/src/client/spark/view/Controls/Adorners/DragRectAdorner.cs index 30d059652..ae68ee5fa 100644 --- a/src/client/spark/view/Controls/Adorners/DragRectAdorner.cs +++ b/src/client/spark/view/Controls/Adorners/DragRectAdorner.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Documents; @@ -9,7 +10,7 @@ namespace mbts.ui.controls.adorners { public class DragRectAdorner : Adorner, IDisposable { Brush _fill = DIYGrid.DefaultSelectionHighlight; Pen _stroke = DIYGrid.DefaultSelectionStroke; - readonly ScrollViewer _scroll_viewer; + readonly ScrollViewerTuple _scroll_viewer_tup; readonly double _drift_multiplier; Point? _drag_start; double _x_drift, _y_drift; @@ -47,21 +48,22 @@ namespace mbts.ui.controls.adorners { /// The element's ScrollViewer. /// The number of pixels per scroll unit. public DragRectAdorner(FrameworkElement adorned_element, ScrollViewer scroll_viewer = null, double drift_multiplier = 1) : base(adorned_element) { - _scroll_viewer = scroll_viewer; _drift_multiplier = drift_multiplier; AdornedElement.PreviewMouseDown += _on_preview_mouse_down; AdornedElement.PreviewMouseMove += _on_preview_mouse_move; AdornedElement.PreviewMouseUp += _on_preview_mouse_up; - if (_scroll_viewer != null) - _scroll_viewer.ScrollChanged += _scroll_viewer_ScrollChanged; + if (scroll_viewer != null) { + _scroll_viewer_tup = new ScrollViewerTuple(scroll_viewer); + _scroll_viewer_tup.scroll_viewer.ScrollChanged += _scroll_viewer_ScrollChanged; + } } public void Dispose() { AdornedElement.PreviewMouseDown -= _on_preview_mouse_down; AdornedElement.PreviewMouseMove -= _on_preview_mouse_move; AdornedElement.PreviewMouseUp -= _on_preview_mouse_up; - if (_scroll_viewer != null) - _scroll_viewer.ScrollChanged -= _scroll_viewer_ScrollChanged; + if (_scroll_viewer_tup != null) + _scroll_viewer_tup.scroll_viewer.ScrollChanged -= _scroll_viewer_ScrollChanged; } protected override void OnRender(DrawingContext drawingContext) { @@ -82,8 +84,10 @@ namespace mbts.ui.controls.adorners { _y_drift = 0; } - void _on_preview_mouse_down(object sender, MouseButtonEventArgs e) => - _drag_start = e.GetPosition(this); + void _on_preview_mouse_down(object sender, MouseButtonEventArgs e) { + if (_scroll_viewer_tup == null || (_scroll_viewer_tup.presenter != null && _scroll_viewer_tup.presenter.IsMouseOver)) + _drag_start = e.GetPosition(this); + } void _on_preview_mouse_move(object sender, MouseEventArgs e) { if (_drag_start.HasValue) { @@ -105,5 +109,15 @@ namespace mbts.ui.controls.adorners { InvalidateVisual(); } } + + class ScrollViewerTuple { + public readonly ScrollViewer scroll_viewer; + ScrollContentPresenter _presenter; + + public ScrollViewerTuple(ScrollViewer scroll_viewer) => + this.scroll_viewer = scroll_viewer; + + public ScrollContentPresenter presenter => _presenter ?? (_presenter = scroll_viewer.descendants_of_type().FirstOrDefault()); + } } } \ No newline at end of file