check point before flying to chapel hill
This commit is contained in:
1 parent
49d0eb812b
commit
4a2007d60c
2 files changed
+54
-23
No files matched your search
@@ -260,15 +260,11 @@ namespace mbts.ui.controls {
|
||||
_begin_explicit_drag += o.OnNext;
|
||||
return Disposable.Create(() => _begin_explicit_drag -= o.OnNext);
|
||||
});
|
||||
DragDropHelper.subscribe_drag_coordinates(this, use_preview_events: true, explicit_drag: explicit_drag_src).Subscribe(pt => {
|
||||
DragDropHelper.subscribe_drag_coordinates(this, init_element: _content_presenter, use_preview_events: true, explicit_drag: explicit_drag_src).Subscribe(pt => {
|
||||
if (_drag_start.HasValue) {
|
||||
if (pt.HasValue) {
|
||||
_drag_stop = pt.Value;
|
||||
var left = Math.Min(_drag_start.Value.X, _drag_stop.Value.X);
|
||||
var top = Math.Min(_drag_start.Value.Y, _drag_stop.Value.Y);
|
||||
_drag_rect_adorner.Child.Margin = new Thickness(left, top, 0, 0);
|
||||
_drag_rect_adorner.Child.Width = Math.Abs(_drag_start.Value.X - _drag_stop.Value.X);
|
||||
_drag_rect_adorner.Child.Height = Math.Abs(_drag_start.Value.Y - _drag_stop.Value.Y);
|
||||
_refresh_drag_rect();
|
||||
} else {
|
||||
if (_drag_stop.HasValue) {
|
||||
_end_drag(_drag_stop.Value);
|
||||
@@ -334,6 +330,33 @@ namespace mbts.ui.controls {
|
||||
void on_support_group_items_changed(bool v) => _support_group_items = v;
|
||||
}
|
||||
|
||||
void _refresh_drag_rect() {
|
||||
var pres = _content_presenter;
|
||||
if (pres == null)
|
||||
return;
|
||||
//var left = Math.Min(_drag_start.Value.X, _drag_stop.Value.X);
|
||||
//var top = Math.Min(_drag_start.Value.Y, _drag_stop.Value.Y);
|
||||
//var width = Math.Abs(_drag_start.Value.X - _drag_stop.Value.X);
|
||||
//var height = Math.Abs(_drag_start.Value.Y - _drag_stop.Value.Y);
|
||||
|
||||
//var clipped_rect = this.GetChildBounds(pres);
|
||||
//clipped_rect.Intersect(new Rect(left, top, width, height));
|
||||
//_drag_rect_adorner.Child.Margin = new Thickness(clipped_rect.Left, clipped_rect.Top, 0, 0);
|
||||
//_drag_rect_adorner.Child.Width = clipped_rect.Width;
|
||||
//_drag_rect_adorner.Child.Height = clipped_rect.Height;
|
||||
|
||||
var left = Math.Min(_drag_start.Value.X, _drag_stop.Value.X);
|
||||
var top = Math.Min(_drag_start.Value.Y, _drag_stop.Value.Y);
|
||||
//var tl = TranslatePoint(new Point(left, top), pres);
|
||||
//var br = TranslatePoint(new Point(
|
||||
// tl.X + Math.Abs(_drag_start.Value.X - _drag_stop.Value.X),
|
||||
// tl.Y + Math.Abs(_drag_start.Value.Y - _drag_stop.Value.Y)), pres);
|
||||
double vdiff = _drag_start_vertical_drift - _scroll_viewer.VerticalOffset;
|
||||
_drag_rect_adorner.Child.Margin = new Thickness(left, top, 0, 0);
|
||||
_drag_rect_adorner.Child.Width = Math.Abs(_drag_start.Value.X - _drag_stop.Value.X);
|
||||
_drag_rect_adorner.Child.Height = Math.Abs(_drag_start.Value.Y - _drag_stop.Value.Y) + Math.Abs(vdiff);
|
||||
}
|
||||
|
||||
public event GroupItemSelectionPivotEventHandler GroupItemSelectionPivot;
|
||||
|
||||
event Action<bool> _begin_explicit_drag;
|
||||
@@ -371,21 +394,6 @@ namespace mbts.ui.controls {
|
||||
|
||||
void _begin_drag_selection(Point pt) {
|
||||
_drag_rect_adorner?.detach();
|
||||
_drag_rect_adorner = new AdornerHost<Rectangle>(this) {
|
||||
Child = new Rectangle {
|
||||
Margin = new Thickness(pt.X, pt.Y, 0, 0),
|
||||
HorizontalAlignment = HorizontalAlignment.Left,
|
||||
VerticalAlignment = VerticalAlignment.Top,
|
||||
StrokeThickness = HighDpiExtensions.pixel_unit
|
||||
}
|
||||
};
|
||||
_set_selection_display_bindings(
|
||||
_drag_rect_adorner.Child,
|
||||
fill_prop: Shape.FillProperty,
|
||||
fill_converter: DIYGrid.SelectionHighlightBrushConverter,
|
||||
stroke_prop: Shape.StrokeProperty,
|
||||
stroke_converter: ValueConverter.create<Color, Brush>(c => new SolidColorBrush(c.with(255))));
|
||||
_drag_rect_adorner.attach();
|
||||
if (InputHitTest(pt) is UIElement el) {
|
||||
var sb = new StringBuilderEx("beginning drag selection on ");
|
||||
OneOf.MatchFirst<DependencyObject, ListBoxItem, GroupItem>(el.VisualAncestors().Prepend(el)).Match(init_common, on_group);
|
||||
@@ -399,12 +407,31 @@ namespace mbts.ui.controls {
|
||||
}
|
||||
}
|
||||
void init_common(ListBoxItem item_container) {
|
||||
// drag state
|
||||
_drag_start = pt;
|
||||
_drag_stop = pt;
|
||||
_drag_start_item = ItemContainerGenerator.ItemFromContainer(item_container);
|
||||
_drag_start_index = ItemContainerGenerator.IndexFromContainer(item_container);
|
||||
_drag_start_vertical_drift = _scroll_viewer.VerticalOffset;
|
||||
if (!IsKeyboardFocusWithin)
|
||||
Keyboard.Focus(item_container);
|
||||
// drag rect
|
||||
_drag_rect_adorner = new AdornerHost<Rectangle>(_content_presenter ?? (UIElement)this) {
|
||||
Child = new Rectangle {
|
||||
HorizontalAlignment = HorizontalAlignment.Left,
|
||||
VerticalAlignment = VerticalAlignment.Top,
|
||||
StrokeThickness = HighDpiExtensions.pixel_unit
|
||||
}
|
||||
};
|
||||
_set_selection_display_bindings(
|
||||
_drag_rect_adorner.Child,
|
||||
fill_prop: Shape.FillProperty,
|
||||
fill_converter: DIYGrid.SelectionHighlightBrushConverter,
|
||||
stroke_prop: Shape.StrokeProperty,
|
||||
stroke_converter: ValueConverter.create<Color, Brush>(c => new SolidColorBrush(c.with(255))));
|
||||
_refresh_drag_rect();
|
||||
_drag_rect_adorner.attach();
|
||||
// log
|
||||
sb.Add($"'{_drag_start_item}' (selection mode {SelectionMode}).");
|
||||
_log.info(sb.ToString());
|
||||
}
|
||||
|
||||
@@ -72,6 +72,7 @@ namespace mbts.ui {
|
||||
public static IObservable<Point?> subscribe_drag_coordinates(
|
||||
FrameworkElement element,
|
||||
FrameworkElement init_element = null,
|
||||
Rect? drag_start_bounds = null,
|
||||
bool use_preview_events = false,
|
||||
MouseButton mouse_button = MouseButton.Left,
|
||||
IObservable<bool> explicit_drag = null) {
|
||||
@@ -133,8 +134,11 @@ namespace mbts.ui {
|
||||
}
|
||||
void on_mouse_down(object sender, MouseButtonEventArgs e) {
|
||||
if (!is_explict_drag) {
|
||||
drag_start = null;
|
||||
mouse_down = e.GetPosition(element);
|
||||
var pt = e.GetPosition(init_element);
|
||||
if (!drag_start_bounds.HasValue || drag_start_bounds.Value.Contains(pt)) {
|
||||
drag_start = null;
|
||||
mouse_down = pt;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user