Dealing the null color (#13131)

jesusalvino · web-flow · commit ab06d832c526 · 2022-07-22T21:23:37.000+05:30
diff --git 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();
         }
-    }
+    }    
 
     /// <summary>
     /// Converts the object type to forground color for the object.
     /// </summary>
-    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
@@ -101,6 +101,8 @@
                      Color="#EEEEEE" />
     <SolidColorBrush x:Key="boolLabelBackground"
                      Color="#F9F9A5" />
+    <SolidColorBrush x:Key="nullLabelBackground"
+                     Color="#F9F9A5" />
 
     <!-- Node Autocomplete -->
     <SolidColorBrush x:Key="autocompletionWindow" Color="#535353" />
diff --git a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml
@@ -329,7 +329,7 @@
                         <TextBlock x:Name="listIndex"
                                    Width="Auto"
                                    Margin="{Binding Path=IsCollection, Converter={StaticResource ListIndexMarginConverter}}"
-                                   Padding="0,0,0,-1"
+                                   Padding="0,0,0,-1"                                   
                                    VerticalAlignment="Center"
                                    Background="{Binding Path=IsCollection, Converter={StaticResource ListIndexBackgroundConverter}}"
                                    FontFamily="{StaticResource SourceCodePro}"
@@ -352,11 +352,17 @@
 
                         <TextBlock Width="Auto"
                                    Margin="{Binding Path=IsTopLevel, Converter={StaticResource TopLevelLabelMarginConverter}}"
-                                   VerticalAlignment="Center"
-                                   Foreground="{Binding Path=ValueType, Converter={StaticResource ObjectTypeConverter}}"
+                                   VerticalAlignment="Center"                                                                      
                                    FontFamily="{StaticResource SourceCodePro}"
                                    Text="{Binding Path=NodeLabel}"
-                                   Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}" />
+                                   Visibility="{Binding Path=NodeLabel, Converter={StaticResource EmptyStringToCollapsedConverter}}" >
+                            <TextBlock.Foreground>
+                                <MultiBinding Converter="{StaticResource ObjectTypeConverter}">
+                                    <Binding Path="ValueType" />
+                                    <Binding Path="NodeLabel" />
+                                    </MultiBinding>
+                            </TextBlock.Foreground>
+                            </TextBlock>
 
                         <Button Margin="10,2,2,2"
                                 Padding="4,0,4,0"

Original file line number	Diff line number	Diff line change
`@@ -3280,20 +3280,20 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste`
`3280`	`3280`	`{`
`3281`	`3281`	`throw new NotImplementedException();`
`3282`	`3282`	`}`
`3283`		`- }`
	`3283`	`+ }`
`3284`	`3284`
`3285`	`3285`	`/// <summary>`
`3286`	`3286`	`/// Converts the object type to forground color for the object.`
`3287`	`3287`	`/// </summary>`
`3288`		`- public class ObjectTypeConverter : IValueConverter`
	`3288`	`+ public class ObjectTypeConverter : IMultiValueConverter`
`3289`	`3289`	`{`
`3290`		`- public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)`
	`3290`	`+ public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)`
`3291`	`3291`	`{`
`3292`	`3292`	`var resourceDictionary = SharedDictionaryManager.DynamoColorsAndBrushesDictionary;`
`3293`	`3293`
`3294`		`- if (value != null)`
	`3294`	`+ if (values != null)`
`3295`	`3295`	`{`
`3296`		`- switch (value)`
	`3296`	`+ switch (values[0])`
`3297`	`3297`	`{`
`3298`	`3298`	`case WatchViewModel.objectType:`
`3299`	`3299`	`return resourceDictionary["objectLabelBackground"] as SolidColorBrush;`
`@@ -3304,14 +3304,25 @@ public object Convert(object value, Type targetType, object parameter, System.Gl`
`3304`	`3304`	`case WatchViewModel.stringType:`
`3305`	`3305`	`return resourceDictionary["stringLabelBackground"] as SolidColorBrush;`
`3306`	`3306`	`case WatchViewModel.boolType:`
`3307`		`- return resourceDictionary["boolLabelBackground"] as SolidColorBrush;`
	`3307`	`+ return resourceDictionary["boolLabelBackground"] as SolidColorBrush;`
`3308`	`3308`	`default:`
`3309`		`- return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;`
	`3309`	`+ if (values[1].ToString() == "List")`
	`3310`	`+ {`
	`3311`	`+ return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;`
	`3312`	`+ }`
	`3313`	`+ else`
	`3314`	`+ {`
	`3315`	`+ return resourceDictionary["nullLabelBackground"] as SolidColorBrush;`
	`3316`	`+ }`
`3310`	`3317`	`};`
`3311`	`3318`	`}`
`3312`		`- return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;`
	`3319`	`+ else`
	`3320`	`+ {`
	`3321`	`+ return resourceDictionary["PrimaryCharcoal200Brush"] as SolidColorBrush;`
	`3322`	`+ }`
`3313`	`3323`	`}`
`3314`		`- public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)`
	`3324`	`+`
	`3325`	`+ public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)`
`3315`	`3326`	`{`
`3316`	`3327`	`throw new NotImplementedException();`
`3317`	`3328`	`}`