Browse Source

Removed new keyword, hiding not needed because its an interface implementation.

Fixed indentation.
pull/660/head
gumme 11 years ago
parent
commit
d87e0a64d9
  1. 158
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/PartialPanelSelectionHandler.cs

158
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Extensions/PartialPanelSelectionHandler.cs

@ -32,87 +32,91 @@ using ICSharpCode.WpfDesign.Extensions;
namespace ICSharpCode.WpfDesign.Designer.Extensions namespace ICSharpCode.WpfDesign.Designer.Extensions
{ {
public class PartialPanelSelectionHandler : BehaviorExtension, IHandlePointerToolMouseDown public class PartialPanelSelectionHandler : BehaviorExtension, IHandlePointerToolMouseDown
{ {
protected override void OnInitialized() protected override void OnInitialized()
{ {
base.OnInitialized(); base.OnInitialized();
this.ExtendedItem.AddBehavior(typeof(IHandlePointerToolMouseDown), this); this.ExtendedItem.AddBehavior(typeof(IHandlePointerToolMouseDown), this);
} }
public new void HandleSelectionMouseDown(IDesignPanel designPanel, MouseButtonEventArgs e, DesignPanelHitTestResult result) #region IHandlePointerToolMouseDown
{
if (e.ChangedButton == MouseButton.Left && MouseGestureBase.IsOnlyButtonPressed(e, MouseButton.Left))
{
e.Handled = true;
new PartialRangeSelectionGesture(result.ModelHit).Start(designPanel, e);
}
}
}
/// <summary> public void HandleSelectionMouseDown(IDesignPanel designPanel, MouseButtonEventArgs e, DesignPanelHitTestResult result)
/// {
/// </summary> if (e.ChangedButton == MouseButton.Left && MouseGestureBase.IsOnlyButtonPressed(e, MouseButton.Left))
internal class PartialRangeSelectionGesture : RangeSelectionGesture {
{ e.Handled = true;
public PartialRangeSelectionGesture(DesignItem container) new PartialRangeSelectionGesture(result.ModelHit).Start(designPanel, e);
: base(container) }
{ }
}
protected override ICollection<DesignItem> GetChildDesignItemsInContainer(Geometry geometry) #endregion
{ }
HashSet<DesignItem> resultItems = new HashSet<DesignItem>();
ViewService viewService = container.Services.View;
HitTestFilterCallback filterCallback = delegate(DependencyObject potentialHitTestTarget) /// <summary>
{ ///
FrameworkElement element = potentialHitTestTarget as FrameworkElement; /// </summary>
if (element != null) internal class PartialRangeSelectionGesture : RangeSelectionGesture
{ {
// ensure we are able to select elements with width/height=0 public PartialRangeSelectionGesture(DesignItem container)
if (element.ActualWidth == 0 || element.ActualHeight == 0) : base(container)
{ {
DependencyObject tmp = element; }
DesignItem model = null;
while (tmp != null)
{
model = viewService.GetModel(tmp);
if (model != null) break;
tmp = VisualTreeHelper.GetParent(tmp);
}
if (model != container)
{
resultItems.Add(model);
return HitTestFilterBehavior.ContinueSkipChildren;
}
}
}
return HitTestFilterBehavior.Continue;
};
HitTestResultCallback resultCallback = delegate(HitTestResult result) protected override ICollection<DesignItem> GetChildDesignItemsInContainer(Geometry geometry)
{ {
if (((GeometryHitTestResult)result).IntersectionDetail == IntersectionDetail.FullyInside || (Mouse.RightButton== MouseButtonState.Pressed && ((GeometryHitTestResult)result).IntersectionDetail == IntersectionDetail.Intersects)) HashSet<DesignItem> resultItems = new HashSet<DesignItem>();
{ ViewService viewService = container.Services.View;
// find the model for the visual contained in the selection area
DependencyObject tmp = result.VisualHit;
DesignItem model = null;
while (tmp != null)
{
model = viewService.GetModel(tmp);
if (model != null) break;
tmp = VisualTreeHelper.GetParent(tmp);
}
if (model != container)
{
resultItems.Add(model);
}
}
return HitTestResultBehavior.Continue;
};
VisualTreeHelper.HitTest(container.View, filterCallback, resultCallback, new GeometryHitTestParameters(geometry)); HitTestFilterCallback filterCallback = delegate(DependencyObject potentialHitTestTarget)
return resultItems; {
} FrameworkElement element = potentialHitTestTarget as FrameworkElement;
} if (element != null)
{
// ensure we are able to select elements with width/height=0
if (element.ActualWidth == 0 || element.ActualHeight == 0)
{
DependencyObject tmp = element;
DesignItem model = null;
while (tmp != null)
{
model = viewService.GetModel(tmp);
if (model != null) break;
tmp = VisualTreeHelper.GetParent(tmp);
}
if (model != container)
{
resultItems.Add(model);
return HitTestFilterBehavior.ContinueSkipChildren;
}
}
}
return HitTestFilterBehavior.Continue;
};
HitTestResultCallback resultCallback = delegate(HitTestResult result)
{
if (((GeometryHitTestResult)result).IntersectionDetail == IntersectionDetail.FullyInside || (Mouse.RightButton== MouseButtonState.Pressed && ((GeometryHitTestResult)result).IntersectionDetail == IntersectionDetail.Intersects))
{
// find the model for the visual contained in the selection area
DependencyObject tmp = result.VisualHit;
DesignItem model = null;
while (tmp != null)
{
model = viewService.GetModel(tmp);
if (model != null) break;
tmp = VisualTreeHelper.GetParent(tmp);
}
if (model != container)
{
resultItems.Add(model);
}
}
return HitTestResultBehavior.Continue;
};
VisualTreeHelper.HitTest(container.View, filterCallback, resultCallback, new GeometryHitTestParameters(geometry));
return resultItems;
}
}
} }

Loading…
Cancel
Save