Merged in SPARK-2245 (pull request #210)

DIYGrid rows are selected on mouse move
This commit is contained in:
Jake Norbut committed 2019-04-08 22:02:31 +00:00
commit 70ff4fa09d
1 file changed
+8 -12
@@ -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<ScrollViewer>().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);