[Nodify] PendingConnection.PreviewTarget fixes

[Playground] Hide pending connection preview container when PreviewText is null #76 Add tooltip back to playground settings
miroiu · Oct 31, 2023 · 8064823 · 8064823
1 parent 1f222b8
commit 8064823
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@
 >   - Added ItemContainer.SelectedBorderThickness dependency property
 > - Bugfixes:
 >   - Fixed PendingConnection.PreviewTarget not being set to null when there is no actual target
+>   - Fixed PendingConnection.PreviewTarget not being set on Connector.PendingConnectionStartedEvent
+>   - Fixed PendingConnection.PreviewTarget not being set to null on Connector.PendingConnectionCompletedEvent
 >   - Fixed connectors panel not being affected by Node.VerticalAlignment
 >   - Changing BorderThickness causes layout shift when selecting an item container
 >   - Fixed the unintentional movement caused by snapping correction

diff --git a/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml b/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml
@@ -267,7 +267,7 @@
                                     <Border Background="{TemplateBinding Background}"
                                             Canvas.Left="{Binding TargetAnchor.X, RelativeSource={RelativeSource TemplatedParent}}"
                                             Canvas.Top="{Binding TargetAnchor.Y, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Visibility="{TemplateBinding EnablePreview, Converter={shared:BooleanToVisibilityConverter}}"
+                                            Visibility="{Binding PreviewText, Converter={shared:StringToVisibilityConverter}}"
                                             Padding="{TemplateBinding Padding}"
                                             BorderThickness="{TemplateBinding BorderThickness}"
                                             BorderBrush="{TemplateBinding BorderBrush}"

diff --git a/Examples/Nodify.Playground/Editor/PendingConnectionViewModel.cs b/Examples/Nodify.Playground/Editor/PendingConnectionViewModel.cs
@@ -29,8 +29,8 @@ public object? PreviewTarget
             }
         }
 
-        private string _previewText = "Drop on connector";
-        public string PreviewText
+        private string? _previewText;
+        public string? PreviewText
         {
             get => _previewText;
             set => SetProperty(ref _previewText, value);
@@ -44,7 +44,7 @@ protected virtual void OnPreviewTargetChanged()
                 ConnectorViewModel con when con == Source => $"Can't connect to self",
                 ConnectorViewModel con => $"{(canConnect ? "Connect" : "Can't connect")} to {con.Title ?? "pin"}",
                 FlowNodeViewModel flow => $"{(canConnect ? "Connect" : "Can't connect")} to {flow.Title ?? "node"}",
-                _ => $"Drop on connector"
+                _ => null
             };
         }
     }

diff --git a/Examples/Nodify.Playground/SettingsView.xaml b/Examples/Nodify.Playground/SettingsView.xaml
@@ -35,7 +35,7 @@
                         <ColumnDefinition Width="Auto" SharedSizeGroup="PropertyName" />
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="{Binding Name}" Margin="0 5 5 0" Grid.Column="0" />
+                    <TextBlock Text="{Binding Name}" ToolTip="{Binding Description}" Margin="0 5 5 0" Grid.Column="0" />
                     <ContentControl Content="{Binding}" Margin="5 5 5 0" Grid.Column="1">
                         <ContentControl.Style>
                             <Style TargetType="{x:Type ContentControl}">

diff --git a/Examples/Nodify.Shared/Converters/StringToVisibilityConverter.cs b/Examples/Nodify.Shared/Converters/StringToVisibilityConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace Nodify
+{
+    public class StringToVisibilityConverter : MarkupExtension, IValueConverter
+    {
+        public Visibility NullVisibility { get; set; } = Visibility.Collapsed;
+
+        public object? Convert(object value, Type targetType, object parameter, CultureInfo culture) 
+            => string.IsNullOrEmpty(value as string) ? NullVisibility : Visibility.Visible;
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            => throw new NotImplementedException();
+
+        public override object ProvideValue(IServiceProvider serviceProvider) => this;
+    }
+}
diff --git a/Nodify/Connections/PendingConnection.cs b/Nodify/Connections/PendingConnection.cs
@@ -265,6 +265,11 @@ protected virtual void OnPendingConnectionStarted(object sender, PendingConnecti
                 {
                     StartedCommand?.Execute(Source);
                 }
+
+                if(EnablePreview)
+                {
+                    PreviewTarget = e.SourceConnector;
+                }
             }
         }
 
@@ -336,6 +341,11 @@ protected virtual void OnPendingConnectionCompleted(object sender, PendingConnec
                         CompletedCommand?.Execute(Target);
                     }
                 }
+
+                if(EnablePreview)
+                {
+                    PreviewTarget = null;
+                }
             }
         }