GraphNodeManager Update

src/DynamoCore/Graph/Nodes/NodeModel.cs

@@ -1081,11 +1081,34 @@ public virtual NodeOutputData OutputData
                 };
             }
         }
-
+        
         /// A collection of error/warning/info messages, dismissed via a sub-menu in the node Context Menu.
         [JsonIgnore]
         public ObservableCollection<string> DismissedAlerts { get; set; } = new ObservableCollection<string>();
 
+
+        private int dismissedAlertsCount;
+        /// <summary>
+        ///     Returns the number of dismissed error/warning/info messages.
+        /// </summary>
+        [JsonIgnore]
+        public int DismissedAlertsCount
+        {
+            get
+            {
+                return dismissedAlertsCount;
+            }
+
+            internal set // Private setter, see "ArgumentLacing" for details.
+            {
+                if (dismissedAlertsCount != value)
+                {
+                    dismissedAlertsCount = value;
+                    RaisePropertyChanged(nameof(DismissedAlertsCount));
+                }
+            }
+        }
+
         #endregion
 
         #region freeze execution

src/DynamoCore/Properties/AssemblyInfo.cs

@@ -48,5 +48,6 @@
 [assembly: InternalsVisibleTo("DynamoManipulation")]
 [assembly: InternalsVisibleTo("IronPythonTests")]
 [assembly: InternalsVisibleTo("DynamoPackagesWPF")]
+[assembly: InternalsVisibleTo("GraphNodeManagerViewExtension")]
 
 [assembly: TypeForwardedTo(typeof(Dynamo.Scheduler.Disposable))]

src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml

@@ -5166,7 +5166,7 @@
     <Style x:Key="InputBoxDarkThemeStyle" TargetType="{x:Type TextBox}">
         <Setter Property="FontFamily" Value="{StaticResource ArtifaktElementRegular}" />
         <Setter Property="Foreground" Value="{StaticResource DarkThemeBodyMediumBrush}"/>
-        <Setter Property="Background" Value="{StaticResource DarkThemeInputBoxBackgroundBrush}"/>
+        <Setter Property="Background" Value="#353535"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
         <Setter Property="FontSize" Value="12px"/>
         <Setter Property="Padding" Value="10"/>
@@ -5253,7 +5253,7 @@
                     <Grid>
                         <TextBox x:Name="InputTextBox"
                                      Padding="8,10"
-                                     Background="#353535"
+                                     Background="{StaticResource DarkThemeInputBoxBackgroundColor}"
                                      BorderThickness="0"
                                      CaretBrush="{StaticResource Blue300Brush}"
                                      Focusable="True"

src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs

@@ -950,8 +950,21 @@ private void DismissedNodeMessages_CollectionChanged(object sender, NotifyCollec
 
             RaisePropertyChanged(nameof(DismissedAlerts));
             RaisePropertyChanged(nameof(NumberOfDismissedAlerts));
+
+            UpdateModelDismissedAlertsCount();
         }
-
+
+        /// <summary>
+        /// Calls an update for the DismissedAlertCount inside the NodeModel to push PropertyChanged fire
+        /// </summary>
+        private void UpdateModelDismissedAlertsCount()
+        {
+            if (DismissedAlerts != null)
+            {
+                nodeLogic.DismissedAlertsCount = DismissedAlerts.Count;
+            }
+        }
+
         /// <summary>
         /// Dispose function
         /// </summary>

src/GraphNodeManagerViewExtension/Controls/ControlColorsAndBrushes.xaml

@@ -1,24 +1,18 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
+        <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
+    </ResourceDictionary.MergedDictionaries>
 
     <!-- Colors -->
-    <Color x:Key="MidGray">#999999</Color>
-    <Color x:Key="LightGray">#CCCCCC</Color>
-    <Color x:Key="Blue">#38abdf</Color>
-    <Color x:Key="MidLightBlue">#366a81</Color>
-    <Color x:Key="MidBlue">#365868</Color>
-    <Color x:Key="MidDarkBlue">#375f71</Color>
-    <Color x:Key="TextColor">#F5F5F5</Color>
-    <Color x:Key="GrayOpacity">#5C5C5C5C</Color>
+    <Color x:Key="MidGrayColor">#999999</Color>
+    <Color x:Key="BorderColor">#555</Color>
 
     <!--  Brushes  -->
-    <SolidColorBrush x:Key="MidGrayBrush" Color="{StaticResource MidGray}" />
-    <SolidColorBrush x:Key="LightGrayBrush" Color="{StaticResource LightGray}" />
-    <SolidColorBrush x:Key="BlueBrush" Color="{StaticResource Blue}" />
-    <SolidColorBrush x:Key="MidLightBlueBrush" Color="{StaticResource MidLightBlue}" />
-    <SolidColorBrush x:Key="MidBlueBrush" Color="{StaticResource MidBlue}" />
-    <SolidColorBrush x:Key="MidDarkBlueBrush" Color="{StaticResource MidDarkBlue}" />
-    <SolidColorBrush x:Key="TextColorBrush" Color="{StaticResource TextColor}" />
-    <SolidColorBrush x:Key="GrayOpacityBrush" Color="{StaticResource GrayOpacity}" />
+    <SolidColorBrush x:Key="MidGrayBrush" Color="{StaticResource MidGrayColor}" />
+    <SolidColorBrush x:Key="BorderColorBrush" Color="{StaticResource BorderColor}" />
 
     <!-- DataGrid style -->
     <Style x:Key="DataGridStyle1" TargetType="{x:Type DataGrid}">
@@ -27,59 +21,69 @@
         <Setter Property="CellStyle" Value="{DynamicResource CellStyle1}"/>
         <Setter Property="RowHeaderWidth" Value="0"/>
         <Setter Property="BorderThickness" Value="0.5" />
-        <Setter Property="BorderBrush" Value="#555555"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderColorBrush}"/>
         <Setter Property="ColumnWidth" Value="Auto"/>
         <Setter Property="GridLinesVisibility" Value="Vertical"/>
-        <Setter Property="VerticalGridLinesBrush" Value="#555555"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource BorderColorBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"></Setter>
+        <Setter Property="SnapsToDevicePixels" Value="True"></Setter>
     </Style>
 
     <!-- DataGridColumnHeader style -->
     <Style x:Key="ColumnHeaderStyle1" TargetType="DataGridColumnHeader">
-        <Setter Property="Height" Value="20"/>
-        <Setter Property="Background" Value="#333333"/>
-        <Setter Property="Foreground" Value="#999999"/>
+        <Setter Property="Height" Value="24"/>
+        <Setter Property="Background" Value="{StaticResource ExtensionBackgroundColor}"/>
+        <Setter Property="Foreground" Value="#bbbbbb"/>
+        <Setter Property="BorderThickness" Value="0 0 0 1"></Setter>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderColorBrush}"></Setter>
         <Setter Property="FontSize" Value="10" />
-        <Setter Property="BorderThickness" Value="0 0 1 0" />
-        <Setter Property="BorderBrush" Value="#555555"/>
-        <Setter Property="Margin" Value="0 0 1 0"/>
-        <Setter Property="Padding" Value="10 0"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="6 0"/>
+        <Setter Property="UseLayoutRounding" Value="True"></Setter>
+        <Setter Property="SnapsToDevicePixels" Value="True"></Setter>
     </Style>
 
     <!-- DataGridRow style -->
     <Style TargetType="DataGridRow" BasedOn="{StaticResource {x:Type DataGridRow}}">
-        <Setter Property="Background" Value="#333333"/>
+        <Setter Property="Background" Value="{StaticResource MainBackgroundColor}"/>
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="MinHeight" Value="24"></Setter>
         <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-        <Setter Property="BorderBrush" Value="#555555"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BorderColorBrush}"/>
+        <Setter Property="UseLayoutRounding" Value="True"></Setter>
+        <Setter Property="SnapsToDevicePixels" Value="True"></Setter>
         <Style.Triggers>
-            <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Background" Value="#555555" />
+            <Trigger Property="AlternationIndex" Value="1">
+                <Setter Property="Background" Value="{StaticResource DarkerGreyBrush}"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" Value="#555555" />
+                <Setter Property="Background" Value="#434343"/>
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="#4a4a4a" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
     <!-- Cell style -->
     <Style x:Key="CellStyle1" TargetType="DataGridCell">
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Margin" Value="1" />
+        <Setter Property="Margin" Value="1 0 0 0" />
         <Setter Property="MinHeight" Value="24"></Setter>
+        <Setter Property="UseLayoutRounding" Value="True"></Setter>
+        <Setter Property="SnapsToDevicePixels" Value="True"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridCell}">
                     <Grid Background="{TemplateBinding Background}">
-                        <ContentPresenter VerticalAlignment="Center" />
+                        <ContentPresenter VerticalAlignment="Center" Margin="2 0" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsSelected" Value="True">
-                <Setter Property="Background" Value="#555555" />
+                <Setter Property="Background" Value="{StaticResource BorderColorBrush}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -111,7 +115,7 @@
 
     <!-- Button Style -->
     <Style x:Key="ButtonStyle1" TargetType="{x:Type Button}">
-        <Setter Property="Foreground" Value="{StaticResource TextColorBrush}"></Setter>
+        <Setter Property="Foreground" Value="{StaticResource DarkThemeBodyMediumBrush}"></Setter> 
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="0"></Setter>
         <Setter Property="FontSize" Value="10"></Setter>
@@ -126,7 +130,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Foreground" Value="{StaticResource BlueBrush}" />
+                <Setter Property="Foreground" Value="{StaticResource Blue400Brush}" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
                 <Setter Property="Foreground" Value="{StaticResource MidLightBlueBrush}" />

src/GraphNodeManagerViewExtension/Controls/FilterItemControl.xaml

@@ -12,12 +12,13 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="ControlColorsAndBrushes.xaml"/>
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
             </ResourceDictionary.MergedDictionaries>
-            <local:BooleanToBorderColorConverter x:Key="BooleanToBorderColorConverter" ToggleBrush="{StaticResource BlueBrush}"/>
+            <local:BooleanToBorderColorConverter x:Key="BooleanToBorderColorConverter" ToggleBrush="{StaticResource Blue400Brush}"/>
             <local:BooleanToColorConverter x:Key="BooleanToColorConverter" 
                                            DefaultBrush="{StaticResource DarkGreyBrush}" 
                                            HoverBrush="{StaticResource DarkMidGreyBrush}" 
-                                           PressedBrush="{StaticResource LightGrayBrush}" 
+                                           PressedBrush="{StaticResource PrimaryCharcoal300Brush}" 
                                            ToggleDefaultBrush="{StaticResource MidBlueBrush}" 
                                            ToggleHoverBrush="{StaticResource MidDarkBlueBrush}" 
                                            TogglePressedBrush="{StaticResource MidLightBlueBrush}" />
@@ -36,7 +37,16 @@
                                              Converter={StaticResource BooleanToColorConverter},
                                              ConverterParameter=Default,
                                              UpdateSourceTrigger=PropertyChanged}">
-                    <ContentPresenter />
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="{Binding FilterImage}" 
+                               Width="10" 
+                               Height="10" 
+                               SnapsToDevicePixels="True"
+                               UseLayoutRounding="True"
+                               VerticalAlignment="Stretch"
+                               Margin="2 0 0 0"/>
+                        <ContentPresenter />
+                    </StackPanel>
                 </Border>
 
                 <ControlTemplate.Triggers>
@@ -68,7 +78,7 @@
                        TextAlignment="Center"
                        FontSize="10"
                        FontWeight="Medium"
-                       Foreground="{StaticResource TextColorBrush}"
+                       Foreground="{StaticResource DarkThemeBodyMediumBrush}"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center">
             </TextBlock>

src/GraphNodeManagerViewExtension/Controls/SearchBoxControl.xaml

@@ -5,11 +5,14 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Dynamo.GraphNodeManager.Controls"
              xmlns:p="clr-namespace:Dynamo.GraphNodeManager.Properties"
+             xmlns:ui="clr-namespace:Dynamo.UI;assembly=DynamoCoreWpf"
              mc:Ignorable="d" 
              d:DesignHeight="40" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
                 <ResourceDictionary Source="ControlColorsAndBrushes.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <local:NonEmptyStringToCollapsedConverter x:Key="NonEmptyStringToCollapsedConverter"/>
@@ -18,24 +21,24 @@
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Padding" Value="15 10 5 5"/>
                 <Setter Property="FontSize" Value="11"/>
-                <Setter Property="Foreground" Value="{StaticResource TextColorBrush}"></Setter>
+                <Setter Property="Foreground" Value="{StaticResource DarkThemeBodyMediumBrush}"></Setter>
             </Style>
             <Style x:Key="TextBlockStyle" TargetType="TextBlock">
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Padding" Value="15 10 5 5"/>
                 <Setter Property="FontSize" Value="11"/>
-                <Setter Property="Foreground" Value="{StaticResource TextColorBrush}"></Setter>
+                <Setter Property="Foreground" Value="{StaticResource DarkThemeBodyMediumBrush}"></Setter>
             </Style>
             <Style x:Key="BorderStyle" TargetType="Border">
                 <Setter Property="BorderThickness" Value="0 0 0 1"></Setter>
                 <Setter Property="Background" Value="Transparent"></Setter>
                 <Setter Property="BorderBrush" Value="{StaticResource MidGrayBrush}"></Setter>
                 <Style.Triggers>
                     <DataTrigger Binding="{Binding ElementName=SearchTextBox, Path=IsMouseOver}" Value="True">
-                        <Setter Property="BorderBrush" Value="{StaticResource LightGrayBrush}"></Setter>
+                        <Setter Property="BorderBrush" Value="{StaticResource PrimaryCharcoal300Brush}"></Setter>
                     </DataTrigger>
                     <DataTrigger Binding="{Binding ElementName=SearchTextBox, Path=IsFocused}" Value="True">
-                        <Setter Property="BorderBrush" Value="{StaticResource BlueBrush}"></Setter>
+                        <Setter Property="BorderBrush" Value="{StaticResource Blue400Brush}"></Setter>
                     </DataTrigger>
                 </Style.Triggers>
             </Style>
@@ -94,13 +97,9 @@
                                 Margin="2 0 0 0"
                                 Opacity="0.5"
                                 VerticalAlignment="Center"
-                                Text="{Binding SearchBoxPrompt}">
-                            <TextBlock.Visibility>
-                                <MultiBinding Converter="{StaticResource MultiBooleanToVisibilityConverter}">
-                                    <Binding Path="SearchText"></Binding>
-                                    <Binding ElementName="SearchTextBox" Path="IsFocused"></Binding>
-                                </MultiBinding>
-                            </TextBlock.Visibility>
+                                Visibility="Visible"
+                                IsHitTestVisible="False"
+                                Text="{x:Static p:Resources.SearchBoxWatermarkText}">
                         </TextBlock>
 
                         <!-- Search Box -->
@@ -112,6 +111,7 @@
                             Cursor="IBeam"
                             HorizontalAlignment="Stretch"
                             TextChanged="SearchTextBox_OnTextChanged"
+                            IsKeyboardFocusWithinChanged="SearchTextBox_OnKeyboardFocusWithinChanged"
                             Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
                         <!-- Clear Search -->

src/GraphNodeManagerViewExtension/Controls/SearchBoxControl.xaml.cs

@@ -37,6 +37,21 @@ private void OnSearchClearButtonClicked(object sender, System.Windows.Input.Mous
         {
             this.SearchTextBox.Clear();
         }
+
+        private void SearchTextBox_OnKeyboardFocusWithinChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            var textBox = sender as TextBox;
+            if (textBox == null) return;
+
+            if (string.IsNullOrEmpty(textBox.Text) && !textBox.IsKeyboardFocusWithin)
+            {
+                SearchTextBoxWatermark.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                SearchTextBoxWatermark.Visibility = Visibility.Collapsed;
+            }
+        }
     }
 
     /// <summary>