Skip to content
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

custom node modal update #15328

Merged
merged 6 commits into from
Jun 20, 2024
Merged

custom node modal update #15328

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
50d54a9
border to custom node prompt
dnenov Jun 18, 2024
8870aad
recenter prompt to dynamo window
dnenov Jun 18, 2024
0e383c8
removed protected from api
dnenov Jun 18, 2024
ebbc251
added protected back to API
dnenov Jun 18, 2024
b11e3b1
resolve the centralizing issue
dnenov Jun 19, 2024
832a8c1
remove old API entry
dnenov Jun 19, 2024
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
25 changes: 17 additions & 8 deletions src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<Window x:Class="Dynamo.Nodes.FunctionNamePrompt"
<Window x:Class="Dynamo.Nodes.FunctionNamePrompt"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
xmlns:ui="clr-namespace:Dynamo.UI"
Title="{x:Static p:Resources.CustomNodePropertyWindowTitle}"
Width="450"
WindowStartupLocation="CenterOwner"
WindowStyle="None">
<Window.Background>
<SolidColorBrush Opacity="0" />
</Window.Background>
<Window.AllowsTransparency>True</Window.AllowsTransparency>

Width="450"
Height="540"
AllowsTransparency="True"
WindowStyle="None"
Background="Transparent">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
Expand Down Expand Up @@ -231,6 +229,8 @@
<Border Name="titleBar"
Grid.Row="0"
Grid.RowSpan="3"
BorderBrush="{StaticResource WorkspaceBackgroundHomeBrush}"
BorderThickness="1"
Background="{StaticResource DarkMidGreyBrush}"
CornerRadius="4"
MouseDown="FunctionNamePrompt_MouseDown">
Expand Down Expand Up @@ -379,5 +379,14 @@
Style="{DynamicResource ResourceKey=CtaButtonStyle}"
TabIndex="2" />
</DockPanel>

<Border Name="frame"
Grid.Row="0"
Grid.RowSpan="3"
BorderBrush="{StaticResource WorkspaceBackgroundHomeBrush}"
BorderThickness="1"
Background="Transparent"
IsHitTestVisible="False"
CornerRadius="4"/>
</Grid>
</Window>
3 changes: 2 additions & 1 deletion src/DynamoCoreWpf/UI/Prompts/FunctionNamePrompt.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
Expand Down Expand Up @@ -32,6 +32,7 @@ public FunctionNamePrompt(IEnumerable<string> categories)
categoryBox.Items.Add(item);
}
}


void OK_Click(object sender, RoutedEventArgs e)
{
Expand Down
2 changes: 0 additions & 2 deletions src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,8 +1726,6 @@ internal void ShowNewFunctionDialog(FunctionNamePromptEventArgs e)
categoryBox = { Text = e.Category },
DescriptionInput = { Text = e.Description },
nameBox = { Text = e.Name },
Owner = this,
WindowStartupLocation = WindowStartupLocation.CenterOwner
};

if (e.CanEditName)
Expand Down
Loading