Skip to content

DYN-8896 Code Only Node View #16188

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 35 commits into from
Jun 5, 2025
Merged

DYN-8896 Code Only Node View #16188

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
25dae72
FirstPass
saintentropy May 5, 2025
5a87ccd
Progress update
saintentropy May 11, 2025
106b8ed
Add Inport triggers and tooltip
saintentropy May 11, 2025
fa31803
Progress Update
saintentropy May 12, 2025
6724c68
Progress on NodeView
saintentropy May 12, 2025
13b986d
Simplify InPorts including lazy load of level spinner
saintentropy May 13, 2025
7ce45f0
Cleanup + Support Code blocks
saintentropy May 13, 2025
e940553
Simplify Ports and verify with Groups
saintentropy May 13, 2025
1d71b38
Add NodeAutoCompleteHover to InPort
saintentropy May 14, 2025
6c6cdd8
Finish node ui
saintentropy May 15, 2025
f87bcf2
fix typo
saintentropy May 15, 2025
24a854d
Merge branch 'master' into CodeOnlyNodeView
saintentropy May 15, 2025
3d96a27
NodeView clean up, comments, and deregister event handlers
saintentropy May 15, 2025
3f79235
Inport cleanup, comments, and deregister events
saintentropy May 16, 2025
e74e8d8
remove BeginInit / EndInit
saintentropy May 16, 2025
b387f0d
Clean up Outport, add comments, deregister events
saintentropy May 16, 2025
3037ffc
Fix test and realing names with old names
saintentropy May 16, 2025
98a6a11
Update api docs
saintentropy May 16, 2025
3136e36
Fix tests
saintentropy May 16, 2025
c84d3e4
Fix API doc
saintentropy May 16, 2025
3bb8e4b
fIx api doc
saintentropy May 16, 2025
bd69474
Add animation style zoom with toggle to simple
saintentropy May 21, 2025
d62d26d
Fix rename tooltip
saintentropy May 21, 2025
1da9765
bug fixes
saintentropy May 22, 2025
06f7c28
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into Code…
zeusongit May 27, 2025
94ab13c
add missing trigger
zeusongit May 27, 2025
3f4bc36
review
zeusongit May 28, 2025
299ee25
adding static constructor back to freeze brush
zeusongit May 28, 2025
56f0d0c
Update DynamoCoreWpf.csproj
zeusongit May 28, 2025
8d08078
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into Code…
zeusongit May 30, 2025
b861d9d
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into Code…
zeusongit Jun 3, 2025
f1913ba
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into Code…
zeusongit Jun 5, 2025
0c717f5
Update NodeViewTests.cs
zeusongit Jun 5, 2025
4fdce39
mark test fail, to be revisited
zeusongit Jun 5, 2025
8a13612
Update NodeViewTests.cs
zeusongit Jun 5, 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
9 changes: 9 additions & 0 deletions src/DynamoCoreWpf/Controls/InPorts.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<UserControl x:Class="Dynamo.UI.Controls.InPorts"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
xmlns:ui="clr-namespace:Dynamo.UI"
mc:Ignorable="d">
</UserControl>
520 changes: 520 additions & 0 deletions src/DynamoCoreWpf/Controls/InPorts.xaml.cs
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/DynamoCoreWpf/Controls/OutPorts.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<UserControl x:Class="Dynamo.UI.Controls.OutPorts"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Dynamo.Wpf.Controls"
mc:Ignorable="d">
</UserControl>
391 changes: 391 additions & 0 deletions src/DynamoCoreWpf/Controls/OutPorts.xaml.cs
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup>
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672;CA1416</NoWarn>
</PropertyGroup>

<Target Name="NpmRunBuild" BeforeTargets="BeforeBuild">
Expand Down Expand Up @@ -128,6 +128,7 @@
</Target>

<ItemGroup>
<None Remove="Controls\OutPorts.xaml" />
<None Remove="Packages\PackageManagerWizard\dist\index.html" />
<None Remove="Controls\Docs\cs-CZ\FileTrustWarningDocumentation.html" />
<None Remove="Controls\Docs\cs-CZ\NodeAutocompleteDocumentation.html" />
Expand Down Expand Up @@ -492,6 +493,7 @@
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controls\InPorts.xaml.cs" />
<Compile Include="Controls\InstalledPackagesControl.xaml.cs">
<DependentUpon>InstalledPackagesControl.xaml</DependentUpon>
</Compile>
Expand All @@ -514,6 +516,7 @@
<Compile Include="Controls\OutPortContextMenu.xaml.cs">
<DependentUpon>OutPortContextMenu.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\OutPorts.xaml.cs" />
<Compile Include="Controls\ParentMenuItem.cs" />
<Compile Include="Controls\RunSettingsControl.xaml.cs">
<DependentUpon>RunSettingsControl.xaml</DependentUpon>
Expand Down Expand Up @@ -898,6 +901,9 @@
<Compile Include="Windows\ModelessChildWindow.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="Controls\InPorts.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\InstalledPackagesControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -906,18 +912,13 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<None Include="UI\Themes\Modern\InPorts.xaml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="UI\Themes\Modern\OutPorts.xaml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Page Include="Controls\OutPortContextMenu.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\OutPorts.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\Prompts\DynamoMessageBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
12 changes: 8 additions & 4 deletions src/DynamoCoreWpf/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,10 +459,10 @@ Dynamo.Controls.NodeView
Dynamo.Controls.NodeView.ContentGrid.get -> System.Windows.Controls.Grid
Dynamo.Controls.NodeView.grid -> System.Windows.Controls.Grid
Dynamo.Controls.NodeView.InitializeComponent() -> void
Dynamo.Controls.NodeView.inputGrid -> System.Windows.Controls.Grid
Dynamo.Controls.NodeView.inputGrid.get -> System.Windows.Controls.Grid
Dynamo.Controls.NodeView.MainContextMenu -> System.Windows.Controls.ContextMenu
Dynamo.Controls.NodeView.NodeView() -> void
Dynamo.Controls.NodeView.PresentationGrid -> System.Windows.Controls.Grid
Dynamo.Controls.NodeView.PresentationGrid.get -> System.Windows.Controls.Grid
Dynamo.Controls.NodeView.SetToolTipDelegate
Dynamo.Controls.NodeView.topControl -> Dynamo.Controls.NodeView
Dynamo.Controls.NodeView.TopControl.get -> Dynamo.Controls.NodeView
Expand Down Expand Up @@ -1450,6 +1450,9 @@ Dynamo.UI.Controls.InOutPortPanel.InOutPortPanel() -> void
Dynamo.UI.Controls.InPortContextMenu
Dynamo.UI.Controls.InPortContextMenu.InitializeComponent() -> void
Dynamo.UI.Controls.InPortContextMenu.InPortContextMenu() -> void
Dynamo.UI.Controls.InPorts
Dynamo.UI.Controls.InPorts.InitializeComponent() -> void
Dynamo.UI.Controls.InPorts.InPorts() -> void
Dynamo.UI.Controls.LibraryToolTipPopup
Dynamo.UI.Controls.LibraryToolTipPopup.LibraryToolTipPopup() -> void
Dynamo.UI.Controls.LibraryToolTipPopup.SetDataContext(object dataContext, bool closeImmediately = false) -> void
Expand All @@ -1461,6 +1464,9 @@ Dynamo.UI.Controls.NodeAutoCompleteSearchControl.ViewModel.get -> Dynamo.ViewMod
Dynamo.UI.Controls.OutPortContextMenu
Dynamo.UI.Controls.OutPortContextMenu.InitializeComponent() -> void
Dynamo.UI.Controls.OutPortContextMenu.OutPortContextMenu() -> void
Dynamo.UI.Controls.OutPorts
Dynamo.UI.Controls.OutPorts.InitializeComponent() -> void
Dynamo.UI.Controls.OutPorts.OutPorts() -> void
Dynamo.UI.Controls.OutputEditor
Dynamo.UI.Controls.OutputEditor.OutputEditor(Dynamo.Controls.NodeView view) -> void
Dynamo.UI.Controls.ParameterEditor
Expand Down Expand Up @@ -5780,9 +5786,7 @@ static readonly Dynamo.UI.FrozenResources.PreviewIconPinnedBrush -> System.Windo
static readonly Dynamo.UI.FrozenResources.WarningFrameFill -> System.Windows.Media.SolidColorBrush
static readonly Dynamo.UI.FrozenResources.WarningFrameStrokeColor -> System.Windows.Media.SolidColorBrush
static readonly Dynamo.UI.FrozenResources.WarningTextForeground -> System.Windows.Media.SolidColorBrush
static readonly Dynamo.ViewModels.PortViewModel.PortBackgroundColorDefault -> System.Windows.Media.SolidColorBrush
static readonly Dynamo.ViewModels.PortViewModel.PortBackgroundColorPreviewOff -> System.Windows.Media.SolidColorBrush
static readonly Dynamo.ViewModels.PortViewModel.PortBorderBrushColorDefault -> System.Windows.Media.SolidColorBrush
static readonly Dynamo.Wpf.UI.GuidedTour.CustomRichTextBox.CustomTextProperty -> System.Windows.DependencyProperty
static readonly Dynamo.Wpf.UI.MouseBehaviour.MouseXProperty -> System.Windows.DependencyProperty
static readonly Dynamo.Wpf.UI.MouseBehaviour.MouseYProperty -> System.Windows.DependencyProperty
Expand Down
13 changes: 11 additions & 2 deletions src/DynamoCoreWpf/UI/Themes/Modern/DataTemplates.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:viewModels="clr-namespace:Dynamo.ViewModels;assembly=DynamoCoreWpf"
xmlns:controls="clr-namespace:Dynamo.Controls;assembly=DynamoCoreWpf"
xmlns:nodes="clr-namespace:Dynamo.Nodes;assembly=DynamoCoreWpf"
xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf"
xmlns:uiControls="clr-namespace:Dynamo.UI.Controls;assembly=DynamoCoreWpf"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:models="clr-namespace:Dynamo.Models;assembly=DynamoCore">

Expand All @@ -27,4 +28,12 @@
<nodes:AnnotationView></nodes:AnnotationView>
</DataTemplate>

</ResourceDictionary>
<DataTemplate DataType="{x:Type viewModels:InPortViewModel}">
<uiControls:InPorts></uiControls:InPorts>
</DataTemplate>

<DataTemplate DataType="{x:Type viewModels:OutPortViewModel}">
<uiControls:OutPorts></uiControls:OutPorts>
</DataTemplate>

</ResourceDictionary>
0 ...namoCoreWpf/UI/Themes/Modern/InPorts.xaml → ...oCoreWpf/UI/Themes/Modern/InPortsOld.xaml
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...amoCoreWpf/UI/Themes/Modern/OutPorts.xaml → ...CoreWpf/UI/Themes/Modern/OutPortsOld.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<ResourceDictionary.MergedDictionaries>
<ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
<ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
<ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
<ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />c:\code\dynamo\src\dynamocorewpf\ui\themes\modern\outportsold.xaml

</ResourceDictionary.MergedDictionaries>

<DataTemplate DataType="{x:Type viewModels:OutPortViewModel}">
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public partial class PortViewModel : ViewModelBase
private const double autocompletePopupSpacing = 2.5;
private const double proxyPortContextMenuOffset = 20;
protected static readonly SolidColorBrush PortBackgroundColorPreviewOff = new SolidColorBrush(Color.FromRgb(102, 102, 102));
protected static readonly SolidColorBrush PortBackgroundColorDefault = new SolidColorBrush(Color.FromRgb(60, 60, 60));
protected static readonly SolidColorBrush PortBorderBrushColorDefault = new SolidColorBrush(Color.FromRgb(161, 161, 161));
internal static readonly SolidColorBrush PortBackgroundColorDefault = new SolidColorBrush(Color.FromRgb(60, 60, 60));
internal static readonly SolidColorBrush PortBorderBrushColorDefault = new SolidColorBrush(Color.FromRgb(161, 161, 161));
private SolidColorBrush portBorderBrushColor = PortBorderBrushColorDefault;
private SolidColorBrush portBackgroundColor = PortBackgroundColorDefault;
private Visibility highlight = Visibility.Collapsed;
Expand Down
2 changes: 0 additions & 2 deletions src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ public AnnotationView()
Resources.MergedDictionaries.Add(SharedDictionaryManager.DynamoColorsAndBrushesDictionary);
Resources.MergedDictionaries.Add(SharedDictionaryManager.DataTemplatesDictionary);
Resources.MergedDictionaries.Add(SharedDictionaryManager.DynamoConvertersDictionary);
Resources.MergedDictionaries.Add(SharedDictionaryManager.InPortsDictionary);
Resources.MergedDictionaries.Add(SharedDictionaryManager.OutPortsDictionary);

InitializeComponent();
Unloaded += AnnotationView_Unloaded;
Expand Down
Loading
Loading