update

DynamoDS · Apr 12, 2024 · 1871844 · 1871844
1 parent 5e479c3
commit 1871844
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 38 deletions.
diff --git a/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml b/src/DynamoCoreWpf/Views/Preview/InfoBubbleView.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="Dynamo.Controls.InfoBubbleView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="clr-namespace:Dynamo.Controls"
+             xmlns:core="clr-namespace:Dynamo.Core"
              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"
-             xmlns:viewmodels="clr-namespace:Dynamo.ViewModels"
-             d:DataContext="{d:DesignInstance Type=viewmodels:InfoBubbleViewModel}"
              Name="InfoBubbleWindowUserControl"
              Loaded="InfoBubbleWindowUserControl_Loaded"
              mc:Ignorable="d">
@@ -63,7 +63,7 @@
                        Margin="-10,-900,0,8"
                        HorizontalAlignment="Left"
                        LastChildFill="False"
-                       Visibility="{Binding DoesNodeDisplayMessages, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                       Visibility="{Binding DoesNodeDisplayMessages,FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
 
                 <!--  Little Chevron Icon  -->
                 <Path Name="ChevronIcon"
@@ -74,7 +74,7 @@
                       Fill="White"
                       SnapsToDevicePixels="True"
                       Stroke="#666666"
-                      Visibility="{Binding DoesNodeDisplayMessages, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+                      Visibility="{Binding DoesNodeDisplayMessages, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
 
                 <!--  Errors  -->
                 <Border Name="ErrorsBorder"
@@ -88,7 +88,7 @@
                         DockPanel.Dock="Bottom"
                         MouseLeave="Border_OnMouseLeave"
                         MouseEnter="Border_OnMouseEnter"
-                        Visibility="{Binding NodeErrorsVisible, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                        Visibility="{Binding NodeErrorsVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                     <!--  Main Grid  -->
                     <Grid Margin="10,10,10,10">
                         <Grid Grid.Row="0">
@@ -126,23 +126,22 @@
                                            FontSize="15"
                                            Foreground="Black"
                                            Text="{x:Static p:Resources.InfoBubbleError}"
-                                           Visibility="Collapsed" />
+                                           Visibility="{Binding NodeErrorsSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                             </Grid>
                             <!--  Error Info  -->
                             <ScrollViewer Grid.Row="1"
                                           MaxHeight="200"
                                           PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"
                                           VerticalScrollBarVisibility="Auto"
-                                          Visibility="Collapsed">
+                                          Visibility="{Binding NodeErrorsSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 <ListBox Margin="0,5,0,0"
                                          Background="Transparent"
                                          BorderThickness="0"
                                          FontFamily="{StaticResource ArtifaktElementRegular}"
                                          FontSize="12px"
                                          Foreground="Black"
                                          ItemsSource="{Binding NodeErrorsToDisplay, UpdateSourceTrigger=PropertyChanged}"
-                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                         Visibility="{Binding NodeErrorsSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                     <ListBox.Style>
                                         <Style>
                                             <!--  Because empty runs have a (read-only) non-zero width, we need to switch out the DataTemplate dynamically  -->
@@ -271,14 +270,14 @@
                                     HorizontalAlignment="Stretch"
                                     BorderBrush="#D9D9D9"
                                     BorderThickness="1"
-                                    Visibility="Collapsed" />
+                                    Visibility="{Binding NodeErrorsShowMoreButtonVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                             <!--  Panel-wide buttons such as Dismiss All and Show All  -->
                             <StackPanel Grid.Row="2"
                                         Margin="0,10,0,0"
                                         HorizontalAlignment="Right"
                                         FlowDirection="RightToLeft"
                                         Orientation="Horizontal"
-                                        Visibility="Collapsed">
+                                        Visibility="{Binding NodeErrorsShowMoreButtonVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 <Button Name="ShowAllErrorsButton"
                                         Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
@@ -287,7 +286,7 @@
                                         BorderThickness="0"
                                         Click="ShowAllErrorsButton_Click"
                                         Foreground="#0696D7"
-                                        Visibility="{Binding NodeErrorsShowMoreButtonVisible, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                        Visibility="{Binding NodeErrorsShowMoreButtonVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                     <Button.Style>
                                         <Style TargetType="Button">
                                             <Style.Triggers>
@@ -318,7 +317,7 @@
                         DockPanel.Dock="Bottom"
                         MouseEnter="Border_OnMouseEnter"
                         MouseLeave="Border_OnMouseLeave"
-                        Visibility="{Binding NodeWarningsVisible, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                        Visibility="{Binding NodeWarningsVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                     <!--  Main Grid  -->
                     <Grid Margin="10,10,10,10">
                         <Grid Grid.Row="0">
@@ -356,24 +355,23 @@
                                            FontSize="15"
                                            Foreground="Black"
                                            Text="{x:Static p:Resources.InfoBubbleWarning}"
-                                           Visibility="Collapsed" />
+                                           Visibility="{Binding NodeWarningsSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                             </Grid>
 
                             <!--  Warning Info  -->
                             <ScrollViewer Grid.Row="1"
                                           MaxHeight="200"
                                           PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"
                                           VerticalScrollBarVisibility="Auto"
-                                          Visibility="Collapsed">
+                                          Visibility="{Binding NodeWarningsSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 <ListBox Name="WarningsListBox"
                                          Margin="0,5,0,0"
                                          BorderThickness="0"
                                          FontFamily="{StaticResource ArtifaktElementRegular}"
                                          FontSize="12px"
                                          Foreground="Black"
                                          ItemsSource="{Binding NodeWarningsToDisplay, UpdateSourceTrigger=PropertyChanged}"
-                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                         Visibility="{Binding NodeWarningsSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                     <ListBox.Style>
                                         <Style>
                                             <!--  Because empty runs have a (read-only) non-zero width, we need to switch out the DataTemplate dynamically  -->
@@ -532,14 +530,14 @@
                                     HorizontalAlignment="Stretch"
                                     BorderBrush="#D9D9D9"
                                     BorderThickness="1"
-                                    Visibility="Collapsed" />
+                                    Visibility="{Binding NodeWarningsSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                             <!--  Panel-wide buttons such as Dismiss All and Show All  -->
                             <StackPanel Grid.Row="2"
                                         Margin="0,10,0,0"
                                         HorizontalAlignment="Right"
                                         FlowDirection="RightToLeft"
                                         Orientation="Horizontal"
-                                        Visibility="Collapsed">
+                                        Visibility="{Binding NodeWarningsSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 <Button Name="DismissAllWarningsButton"
                                         Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
@@ -562,7 +560,7 @@
                                         BorderThickness="0"
                                         Click="ShowAllWarningsButton_Click"
                                         Foreground="#0696D7"
-                                        Visibility="{Binding NodeWarningsShowMoreButtonVisible, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                        Visibility="{Binding NodeWarningsShowMoreButtonVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                     <Button.Style>
                                         <Style TargetType="Button">
                                             <Style.Triggers>
@@ -593,7 +591,7 @@
                         DockPanel.Dock="Bottom"
                         MouseEnter="Border_OnMouseEnter"
                         MouseLeave="Border_OnMouseLeave"
-                        Visibility="{Binding NodeInfoVisible, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                        Visibility="{Binding NodeInfoVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                     <!--  Main Grid  -->
                     <Grid Margin="10,10,10,10">
                         <Grid Grid.Row="0">
@@ -634,22 +632,21 @@
                                            FontSize="15"
                                            Foreground="Black"
                                            Text="{x:Static p:Resources.InfoBubbleInfo}"
-                                           Visibility="Collapsed" />
+                                           Visibility="{Binding NodeInfoSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                             </Grid>
                             <!--  Info Info  -->
                             <ScrollViewer Grid.Row="1"
                                           MaxHeight="200"
                                           PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"
                                           VerticalScrollBarVisibility="Auto"
-                                          Visibility="Collapsed">
+                                          Visibility="{Binding NodeInfoSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 <ListBox Margin="0,5,0,0"
                                          BorderThickness="0"
                                          FontFamily="{StaticResource ArtifaktElementRegular}"
                                          FontSize="12px"
                                          Foreground="Black"
                                          ItemsSource="{Binding NodeInfoToDisplay, UpdateSourceTrigger=PropertyChanged}"
-                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                         Visibility="{Binding NodeInfoSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                         ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                     <ListBox.Style>
                                         <Style>
                                             <!--  Because empty runs have a (read-only) non-zero width, we need to switch out the DataTemplate dynamically  -->
@@ -800,14 +797,14 @@
                                     HorizontalAlignment="Stretch"
                                     BorderBrush="#D9D9D9"
                                     BorderThickness="1"
-                                    Visibility="Collapsed" />
+                                    Visibility="{Binding NodeInfoSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                             <!--  Panel-wide buttons such as Dismiss All and Show All  -->
                             <StackPanel Grid.Row="2"
                                         Margin="0,10,0,0"
                                         HorizontalAlignment="Right"
                                         FlowDirection="RightToLeft"
                                         Orientation="Horizontal"
-                                        Visibility="Collapsed">
+                                        Visibility="{Binding NodeInfoSectionExpanded, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 <Button Name="DismissAllInfoButton"
                                         Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
@@ -817,7 +814,7 @@
                                         Click="DismissAllInfoButton_Click"
                                         Content="{x:Static p:Resources.NodeInformationalStateDismissAll}"
                                         Foreground="#0696D7"
-                                        Visibility="{Binding ElementName=InfoBubbleWindowUserControl, Path=DataContext.NodeInfoSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+                                        Visibility="{Binding ElementName=InfoBubbleWindowUserControl, FallbackValue=Collapsed, Path=DataContext.NodeInfoSectionExpanded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
                                 <Button Name="ShowAllInfoButton"
                                         Margin="0,0,10,0"
                                         HorizontalAlignment="Right"
@@ -826,7 +823,7 @@
                                         BorderThickness="0"
                                         Click="ShowAllInfoButton_Click"
                                         Foreground="#0696D7"
-                                        Visibility="{Binding NodeInfoShowMoreButtonVisible, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                        Visibility="{Binding NodeInfoShowMoreButtonVisible, FallbackValue=Collapsed, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                     <Button.Style>
                                         <Style TargetType="Button">
                                             <Style.Triggers>