diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
index f9c9ba4ff8c..78db6e32d8b 100644
--- a/src/DynamoCoreWpf/UI/Converters.cs
+++ b/src/DynamoCoreWpf/UI/Converters.cs
@@ -3280,20 +3280,20 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
{
throw new NotImplementedException();
}
- }
+ }
///
/// Converts the object type to forground color for the object.
///
- public class ObjectTypeConverter : IValueConverter
+ public class ObjectTypeConverter : IMultiValueConverter
{
- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+ public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
var resourceDictionary = SharedDictionaryManager.DynamoColorsAndBrushesDictionary;
- if (value != null)
+ if (values != null)
{
- switch (value)
+ switch (values[0])
{
case WatchViewModel.objectType:
return resourceDictionary["objectLabelBackground"] as SolidColorBrush;
@@ -3304,14 +3304,25 @@ public object Convert(object value, Type targetType, object parameter, System.Gl
case WatchViewModel.stringType:
return resourceDictionary["stringLabelBackground"] as SolidColorBrush;
case WatchViewModel.boolType:
- return resourceDictionary["boolLabelBackground"] as SolidColorBrush;
+ return resourceDictionary["boolLabelBackground"] as SolidColorBrush;
default:
- return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;
+ if (values[1].ToString() == "List")
+ {
+ return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;
+ }
+ else
+ {
+ return resourceDictionary["nullLabelBackground"] as SolidColorBrush;
+ }
};
}
- return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;
+ else
+ {
+ return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;
+ }
}
- public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+
+ public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
index d050a599154..8e49a333b38 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoColorsAndBrushes.xaml
@@ -101,6 +101,8 @@
Color="#EEEEEE" />
+
diff --git a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
index 4c81f342632..9082eacbc28 100644
--- a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
+++ b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
@@ -329,7 +329,7 @@
+ Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}" >
+
+
+
+
+
+
+