From 79646bb94163c4d19934f2e4ffd211d394844029 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 8 Apr 2019 11:35:27 -0500 Subject: [PATCH] OB rows are selected as the mouse moves intsead of on mouse up; adorner region is no longer drawn --- .../spark/view/Controls/DIYGrid/DIYGrid.cs | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index 088ede0dd..3b5eb445f 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -125,7 +125,6 @@ namespace mbts.ui.controls { class DIYGridRowsPresenter : ListBox { double _row_height = DIYGrid.DefaultRowHeight; DIYGrid _grid; - DragRectAdorner _drag_rect_adorner; ScrollViewer _scroll_viewer; Point? _drag_start; double _drag_start_vertical_drift; @@ -142,17 +141,8 @@ namespace mbts.ui.controls { _row_height = _grid.RowHeight; _grid.RowHeightChanged += on_row_height_changed; _scroll_viewer = this.descendants_of_type().First(); - _drag_rect_adorner = new DragRectAdorner(this, _scroll_viewer, _row_height); - _drag_rect_adorner.SetResourceReference(DragRectAdorner.FillProperty, DIYGrid.ActiveSelectionHighlightKey); - _drag_rect_adorner.SetResourceReference(DragRectAdorner.StrokeProperty, DIYGrid.SelectionStrokeKey); - _drag_rect_adorner.attach(); - }; - Unloaded += (s, e) => { - if (_drag_rect_adorner != null) { - _drag_rect_adorner.detach(); - Disposable.dispose(ref _drag_rect_adorner); - } }; + void on_row_height_changed(double v) => _row_height = v; } @@ -171,7 +161,7 @@ namespace mbts.ui.controls { base.OnPreviewMouseLeftButtonDown(e); } - protected override void OnPreviewMouseUp(MouseButtonEventArgs e) { + protected override void OnPreviewMouseMove(MouseEventArgs e) { if (_drag_start.HasValue) { var drag_stop = e.GetPosition(this); double vertical_diff = drag_stop.Y + (_row_height * (_scroll_viewer.VerticalOffset - _drag_start_vertical_drift)) - _drag_start.Value.Y; @@ -196,6 +186,12 @@ namespace mbts.ui.controls { var selection = Enumerable.Range(start_index, n_items).Select(i => Items[i]).ToList(); SetSelectedItems(selection); } + } + base.OnPreviewMouseMove(e); + } + + protected override void OnPreviewMouseUp(MouseButtonEventArgs e) { + if (_drag_start.HasValue) { _drag_start = null; } base.OnPreviewMouseUp(e);