Skip to content

Lazy Load Node Context Menu #12074

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
merged 24 commits into from
Oct 12, 2021
Merged

Lazy Load Node Context Menu #12074

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
99048de
Lazy-loads node context menu
OliverEGreen Sep 23, 2021
ecfa38b
Centralises ContextMenu style
OliverEGreen Sep 23, 2021
a433e4c
Labels
OliverEGreen Sep 23, 2021
c6378e2
Allows for NodeViewCustomizations to add their own MenuItems
OliverEGreen Sep 24, 2021
a4fbed3
Disables dismissed alerts for now
OliverEGreen Sep 24, 2021
d6b82e1
Comments methods and removes redundant methods.
OliverEGreen Sep 24, 2021
c4c9f6f
Undoes some extra work
OliverEGreen Sep 24, 2021
1cc38bb
Updates
OliverEGreen Sep 24, 2021
74092b5
Undoes irrelevant changes
OliverEGreen Sep 24, 2021
7f5c04b
Disposes MenuItems whenever the node ContextMenu is closed.
OliverEGreen Sep 24, 2021
3d38de6
Update NodeView.xaml.cs
OliverEGreen Sep 24, 2021
4ab00a2
Tidies up Node Context Menu construction code.
OliverEGreen Sep 27, 2021
a43ec02
Update NodeView.xaml.cs
OliverEGreen Sep 27, 2021
708123d
Creates static NodeContextMenuBuilder class.
OliverEGreen Sep 28, 2021
c08c218
Update Watch.cs
OliverEGreen Sep 28, 2021
935ed99
Merge remote-tracking branch 'upstream/master' into node_lazy_context…
OliverEGreen Sep 28, 2021
e17c4fb
Merge branch 'master' into node_lazy_context_menu
OliverEGreen Sep 28, 2021
5604732
Responds to comments
OliverEGreen Sep 29, 2021
e9e3333
Adds tests
OliverEGreen Sep 29, 2021
3765a04
Update NodeContextMenuBuilderTests.cs
OliverEGreen Sep 29, 2021
6085dcb
Merge branch 'DynamoDS:master' into node_lazy_context_menu
OliverEGreen Sep 30, 2021
30d9cd0
Merge branch 'master' into node_lazy_context_menu
OliverEGreen Oct 6, 2021
aaf8b2b
Merge remote-tracking branch 'upstream/master' into node_lazy_context…
OliverEGreen Oct 11, 2021
b46e7bf
Reverts style name
OliverEGreen Oct 11, 2021
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
1 change: 1 addition & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@
<Compile Include="Utilities\CrashUtilities.cs" />
<Compile Include="Utilities\LibraryDragAndDrop.cs" />
<Compile Include="Utilities\MessageBoxUtilities.cs" />
<Compile Include="Utilities\NodeContextMenuBuilder.cs" />
<Compile Include="Utilities\OnceDisposable.cs" />
<Compile Include="TestInfrastructure\ConnectorMutator.cs" />
<Compile Include="TestInfrastructure\MutationTestAttribute.cs" />
Expand Down
2 changes: 0 additions & 2 deletions ...namoCoreWpf/NodeViewCustomization/NodeViewCustomizations/FunctionNodeViewCustomization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ public void CustomizeView(Function function, NodeView nodeView)
functionNodeModel = function;
dynamoViewModel = nodeView.ViewModel.DynamoViewModel;

nodeView.MainContextMenu.Items.Add(new Separator());

// edit contents
var editItem = new MenuItem
{
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
<comment>Context menu item</comment>
</data>
<data name="ContextMenuDelete" xml:space="preserve">
<value>Remove</value>
<value>Delete</value>
<comment>Context menu for selected node - delete selected node</comment>
</data>
<data name="ContextMenuEditCustomNode" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@
<comment>View menu | Zoom out</comment>
</data>
<data name="ContextMenuDelete" xml:space="preserve">
<value>Remove</value>
<value>Delete</value>
<comment>Context menu for selected node - delete selected node</comment>
</data>
<data name="NodeContextMenuHelp" xml:space="preserve">
Expand Down
6 changes: 3 additions & 3 deletions src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,7 +2498,7 @@
</Setter>
</Style>

<Style x:Key="ContextMenuStyle" TargetType="{x:Type ContextMenu}">
<Style x:Key="NodeContextMenuStyle" TargetType="{x:Type ContextMenu}">
<Setter Property="Placement" Value="MousePoint" />
<Setter Property="Foreground" Value="{StaticResource NodeContextMenuForeground}" />
<Setter Property="FontSize" Value="13px" />
Expand All @@ -2510,9 +2510,9 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type ContextMenu}">
<Border x:Name="Border"
Background="{TemplateBinding Background}"
Background="{StaticResource NodeContextMenuBackground}"
BorderThickness="0px">
<StackPanel Margin="0,5"
<StackPanel Margin="0,10"
ClipToBounds="True"
IsItemsHost="True"
Orientation="Vertical" />
Expand Down
Loading