package zoom out state (#14507)

dnenov · QilongTang · web-flow · commit 892253eb9996 · 2023-10-23T23:50:26.000-04:00
- changed order of zoom out states to favor package over preview off
- priorities are Error &gt; Warning &gt; Info ; Frozen &gt; Package &gt; Preview &gt; None

Co-authored-by: Aaron (Qilong) &lt;173288704@qq.com&gt;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
 using Dynamo.Configuration;
 using Dynamo.Engine.CodeGeneration;
 using Dynamo.Graph;
@@ -18,9 +7,19 @@
 using Dynamo.Logging;
 using Dynamo.Models;
 using Dynamo.Selection;
-using Dynamo.UI;
 using Dynamo.Wpf.ViewModels.Core;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
 using Point = System.Windows.Point;
 using Size = System.Windows.Size;
 
@@ -1349,7 +1348,7 @@ internal SolidColorBrush GetBorderColor()
 
             /*
                 Priorities seem to be:
-                Error > Warning > Info ; Frozen > Preview > None
+                Error > Warning > Info ; Frozen > Package > Preview > None
                 Pass through all possible states in reverse order 
                 to assign icon values for each possible scenario
             */
@@ -1358,14 +1357,6 @@ Pass through all possible states in reverse order
 
             if (this.NodeModel == null) return result;
 
-            if (this.NodeModel.IsCustomFunction)
-            {
-                result = nodeCustomColor;
-                if(result != null)
-                {
-                    ImgGlyphOneSource = packageGlyph;
-                }
-            }
             if (!this.IsVisible)
             {
                 result = nodePreviewColor;
@@ -1374,6 +1365,24 @@ Pass through all possible states in reverse order
                     ImgGlyphOneSource = previewGlyph;
                 } 
             }
+
+            if (this.NodeModel.IsCustomFunction)
+            {
+                result = nodeCustomColor;
+                if(result != null)
+                {
+                    if (ImgGlyphOneSource == null)
+                    {
+                        ImgGlyphOneSource = packageGlyph;
+                    }
+                    else
+                    {
+                        ImgGlyphOneSource = packageGlyph;
+                        ImgGlyphTwoSource = previewGlyph;
+                    }
+                }
+            }
+
             if (this.IsFrozen)
             {
                 result = nodeFrozenOverlayColor;
@@ -1382,7 +1391,7 @@ Pass through all possible states in reverse order
                     if (ImgGlyphOneSource == null)
                     {
                         ImgGlyphOneSource = frozenGlyph;
-                    }
+                    }   
                     else
                     {
                         ImgGlyphOneSource = frozenGlyph;
