diff --git a/Documents/CHANGELOG.txt b/Documents/CHANGELOG.txt index 5ed20ab..77656f9 100644 --- a/Documents/CHANGELOG.txt +++ b/Documents/CHANGELOG.txt @@ -24,6 +24,7 @@ DETAILED CHANGELOG: + Added GraphArea::GetChildControls() method to easily fetch any child objects (incl. custom) by condition or just get all of them + Added GraphArea::VertexLabelFactory and GraphArea::EdgeLabelFactory properties for corresponding label factories. Will generate labels automatically after the graph layout if defined + Added GraphArea::MoveToFront() and GraphArea::MoveToBack() methods that will move specified GraphArea child to the top/bottom of the visual tree respectively + + Added MouseEventArgs for VertexDoubleClick event to be able to correctly block click event when you're dragging vertex and open dialog window at once + Fixed id autoresolve issue when calling GraphArea::GenerateAllEdges() after manual edge data compilation (thanks to Hannes Hasenauer) + Fixed some METRO code not that hasn't been ported correctly + Fixed an exception in ZoomControl caused by Ctrl + Alt + DblClick combination (thanks to persalmi) diff --git a/GraphX.Controls/Controls/GraphAreaBase.cs b/GraphX.Controls/Controls/GraphAreaBase.cs index 42636bc..4025fba 100644 --- a/GraphX.Controls/Controls/GraphAreaBase.cs +++ b/GraphX.Controls/Controls/GraphAreaBase.cs @@ -282,10 +282,10 @@ namespace GraphX public event VertexSelectedEventHandler VertexDoubleClick; #if WPF - internal virtual void OnVertexDoubleClick(VertexControl vc) + internal virtual void OnVertexDoubleClick(VertexControl vc, MouseButtonEventArgs e) { if (VertexDoubleClick != null) - VertexDoubleClick(this, new VertexSelectedEventArgs(vc, null, Keyboard.Modifiers)); + VertexDoubleClick(this, new VertexSelectedEventArgs(vc, e, Keyboard.Modifiers)); } #elif METRO internal virtual void OnVertexDoubleClick(VertexControl vc, PointerRoutedEventArgs e) diff --git a/GraphX.Controls/Controls/VertexControl.cs b/GraphX.Controls/Controls/VertexControl.cs index c58d014..239e15d 100644 --- a/GraphX.Controls/Controls/VertexControl.cs +++ b/GraphX.Controls/Controls/VertexControl.cs @@ -181,7 +181,7 @@ namespace GraphX.Controls void VertexControl_MouseDoubleClick(object sender, MouseButtonEventArgs e) { if (RootArea != null && Visibility == Visibility.Visible) - RootArea.OnVertexDoubleClick(this); + RootArea.OnVertexDoubleClick(this, e); //e.Handled = true; }