Skip to content

DYN-9428 - Update DNA Method Calls #16474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zeusongit merged 6 commits into from
Aug 28, 2025
Merged

DYN-9428 - Update DNA Method Calls #16474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14d1b51
Change Dispatcher methods
johnpierson Aug 26, 2025
e7b81fe
Update src/DynamoCoreWpf/Utilities/NodeAutoCompleteUtilities.cs
johnpierson Aug 26, 2025
6ebab00
Update NodeAutoCompleteUtilities.cs
johnpierson Aug 27, 2025
51a0456
Update NodeAutoCompleteUtilities.cs
johnpierson Aug 27, 2025
50269d5
Update PublicAPI.Unshipped.txt
johnpierson Aug 28, 2025
9ea44cf
Update PublicAPI.Unshipped.txt
johnpierson Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/DynamoCoreWpf/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,10 @@ Dynamo.Controls.WorkspaceBackgroundColorConverter.CustomBackgroundColor.set -> v
Dynamo.Controls.WorkspaceBackgroundColorConverter.HomeBackgroundColor.get -> System.Windows.Media.Color
Dynamo.Controls.WorkspaceBackgroundColorConverter.HomeBackgroundColor.set -> void
Dynamo.Controls.WorkspaceBackgroundColorConverter.WorkspaceBackgroundColorConverter() -> void
Dynamo.Controls.WorkspaceContextMenuHeightConverter
Dynamo.Controls.WorkspaceContextMenuHeightConverter.Convert(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
Dynamo.Controls.WorkspaceContextMenuHeightConverter.ConvertBack(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
Dynamo.Controls.WorkspaceContextMenuHeightConverter.WorkspaceContextMenuHeightConverter() -> void
Dynamo.Controls.WorkspaceTypeConverter
Dynamo.Controls.WorkspaceTypeConverter.Convert(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
Dynamo.Controls.WorkspaceTypeConverter.ConvertBack(object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture) -> object
Expand Down
23 changes: 14 additions & 9 deletions src/DynamoCoreWpf/Utilities/NodeAutoCompleteUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,36 @@
using System.Linq;
using System.Windows;
using System.Windows.Threading;
using Dynamo.ViewModels;

namespace Dynamo.Wpf.Utilities
{
internal static class NodeAutoCompleteUtilities
{
// We want to perform an AutoLayout operation only after all nodes have updated their UI.
// Therefore, we will queue the AutoLayout operation to execute during the next idle event.
internal static void PostAutoLayoutNodes(WorkspaceModel wsModel,
internal static void PostAutoLayoutNodes(DynamoViewModel dynamoViewModel, WorkspaceModel wsModel,
NodeModel queryNode,
IEnumerable<NodeModel> misplacedNodes,
bool skipInitialAutoLayout,
bool checkWorkspaceNodes,
PortType portType,
Action finalizer)
{
if (Application.Current?.Dispatcher != null)

var dispatcher = dynamoViewModel?.UIDispatcher ?? Dispatcher.CurrentDispatcher;

if (dispatcher != null)
{
Application.Current.Dispatcher.BeginInvoke(() => AutoLayoutNodes(wsModel,
queryNode,
misplacedNodes,
skipInitialAutoLayout,
checkWorkspaceNodes,
portType,
finalizer), DispatcherPriority.ApplicationIdle);
dispatcher.BeginInvoke(() => AutoLayoutNodes(wsModel,
queryNode,
misplacedNodes,
skipInitialAutoLayout,
checkWorkspaceNodes,
portType,
finalizer), DispatcherPriority.ApplicationIdle);
}

}

internal static Rect2D GetNodesBoundingBox(IEnumerable<NodeModel> nodes)
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/ViewModels/Search/NodeSearchElementViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ protected virtual void CreateAndConnectToPort(object parameter)

Action ensureUndoGroup = () => undoRecorderGroup?.Dispose();

NodeAutoCompleteUtilities.PostAutoLayoutNodes(dynamoViewModel.CurrentSpace, initialNode, misplacedNodes, false, true, portModel.PortType, ensureUndoGroup);
NodeAutoCompleteUtilities.PostAutoLayoutNodes(dynamoViewModel, dynamoViewModel.CurrentSpace, initialNode, misplacedNodes, false, true, portModel.PortType, ensureUndoGroup);
}

protected virtual bool CanCreateAndConnectToPort(object parameter)
Expand Down
4 changes: 2 additions & 2 deletions src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ internal void ConsolidateTransientNodes()
connector.IsTransient = false;
}

NodeAutoCompleteUtilities.PostAutoLayoutNodes(node.WorkspaceViewModel.Model, node.NodeModel, transientNodes.Select(x => x.NodeModel), true, true, PortViewModel.PortType, null);
NodeAutoCompleteUtilities.PostAutoLayoutNodes(dynamoViewModel, node.WorkspaceViewModel.Model, node.NodeModel, transientNodes.Select(x => x.NodeModel), true, true, PortViewModel.PortType, null);

if (PortViewModel.PortType == PortType.Input)
{
Expand Down Expand Up @@ -983,7 +983,7 @@ internal void AddCluster(ClusterResultItem clusterResultItem)
}

// Perform auto-layout for the newly added nodes
NodeAutoCompleteUtilities.PostAutoLayoutNodes(
NodeAutoCompleteUtilities.PostAutoLayoutNodes(dynamoViewModel,
workspaceViewModel.DynamoViewModel.CurrentSpace,
PortViewModel.NodeViewModel.NodeModel,
createdNodes.Values,
Expand Down
Loading