Bläddra i källkod

Added missing socket colors

Krzysztof Krysiński 3 veckor sedan
förälder
incheckning
3c485f0b90

+ 23 - 0
src/PixiEditor.UI.Common/Accents/Base.axaml

@@ -66,6 +66,10 @@
             <Color x:Key="PointsDataSocketColor">#e1d0e1</Color>
             <Color x:Key="PointsDataSocketColor">#e1d0e1</Color>
             <Color x:Key="TextDataSocketColor">#f2f2f2</Color>
             <Color x:Key="TextDataSocketColor">#f2f2f2</Color>
             <Color x:Key="Matrix3X3SocketColor">#ffea4f</Color>
             <Color x:Key="Matrix3X3SocketColor">#ffea4f</Color>
+            <Color x:Key="DocumentReferenceColor">#8F6A36</Color>
+            <Color x:Key="IReadOnlyNodeGraphColor">#E86A9E</Color>
+            <Color x:Key="EnumSocketColor">#a6aeba</Color>
+
             <GradientStops x:Key="ShapeDataSocketGradient">
             <GradientStops x:Key="ShapeDataSocketGradient">
                 <GradientStop Offset="0" Color="{StaticResource EllipseDataSocketColor}" />
                 <GradientStop Offset="0" Color="{StaticResource EllipseDataSocketColor}" />
                 <GradientStop Offset="0.33" Color="{StaticResource EllipseDataSocketColor}" />
                 <GradientStop Offset="0.33" Color="{StaticResource EllipseDataSocketColor}" />
@@ -75,6 +79,19 @@
                 <GradientStop Offset="1" Color="{StaticResource PointsDataSocketColor}" />
                 <GradientStop Offset="1" Color="{StaticResource PointsDataSocketColor}" />
             </GradientStops>
             </GradientStops>
 
 
+            <Color x:Key="ObjectImageColor">#FF6A72</Color>
+            <Color x:Key="ObjectFilterColor">#FFD84A</Color>
+            <Color x:Key="ObjectMatrixColor">#47F0C2</Color>
+            <Color x:Key="ObjectIntColor">#6A7CFF</Color>
+
+            <GradientStops x:Key="ObjectDataSocketGradient">
+                <GradientStop Offset="0.00" Color="{StaticResource ObjectImageColor}" />
+                <GradientStop Offset="0.25" Color="{StaticResource ObjectFilterColor}" />
+                <GradientStop Offset="0.50" Color="{StaticResource ObjectMatrixColor}" />
+                <GradientStop Offset="0.75" Color="{StaticResource ObjectIntColor}" />
+                <GradientStop Offset="1.00" Color="{StaticResource ObjectImageColor}" />
+            </GradientStops>
+
             <!-- Zones & Frames -->
             <!-- Zones & Frames -->
             <Color x:Key="PixiEditorModifyImageBorderColor">#68abdf</Color>
             <Color x:Key="PixiEditorModifyImageBorderColor">#68abdf</Color>
             <Color x:Key="PixiEditorModifyImageNodeBackgroundColor">#4068abdf</Color>
             <Color x:Key="PixiEditorModifyImageNodeBackgroundColor">#4068abdf</Color>
@@ -172,11 +189,17 @@
             <SolidColorBrush x:Key="StringSocketBrush" Color="{StaticResource StringSocketColor}" />
             <SolidColorBrush x:Key="StringSocketBrush" Color="{StaticResource StringSocketColor}" />
             <SolidColorBrush x:Key="Matrix3X3SocketBrush" Color="{StaticResource Matrix3X3SocketColor}" />
             <SolidColorBrush x:Key="Matrix3X3SocketBrush" Color="{StaticResource Matrix3X3SocketColor}" />
             <SolidColorBrush x:Key="Float3x3SocketBrush" Color="{StaticResource Matrix3X3SocketColor}" />
             <SolidColorBrush x:Key="Float3x3SocketBrush" Color="{StaticResource Matrix3X3SocketColor}" />
+            <SolidColorBrush x:Key="DocumentReferenceSocketBrush" Color="{StaticResource DocumentReferenceColor}" />
+            <SolidColorBrush x:Key="IReadOnlyNodeGraphSocketBrush" Color="{StaticResource IReadOnlyNodeGraphColor}" />
+            <SolidColorBrush x:Key="EnumSocketBrush" Color="{StaticResource EnumSocketColor}" />
 
 
             <SolidColorBrush x:Key="FoundersPurpleBrush" Color="{StaticResource FoundersPurpleColor}" />
             <SolidColorBrush x:Key="FoundersPurpleBrush" Color="{StaticResource FoundersPurpleColor}" />
 
 
             <ConicGradientBrush x:Key="ShapeVectorDataSocketBrush"
             <ConicGradientBrush x:Key="ShapeVectorDataSocketBrush"
                                 GradientStops="{StaticResource ShapeDataSocketGradient}" />
                                 GradientStops="{StaticResource ShapeDataSocketGradient}" />
+            <ConicGradientBrush x:Key="ObjectSocketBrush"
+                                GradientStops="{StaticResource ObjectDataSocketGradient}" />
+
             <SolidColorBrush x:Key="EllipseVectorDataSocketBrush" Color="{StaticResource EllipseDataSocketColor}" />
             <SolidColorBrush x:Key="EllipseVectorDataSocketBrush" Color="{StaticResource EllipseDataSocketColor}" />
             <SolidColorBrush x:Key="LineVectorDataSocketBrush" Color="{StaticResource LineDataSocketColor}" />
             <SolidColorBrush x:Key="LineVectorDataSocketBrush" Color="{StaticResource LineDataSocketColor}" />
             <SolidColorBrush x:Key="RectangleVectorDataSocketBrush" Color="{StaticResource RectangleDataSocketColor}" />
             <SolidColorBrush x:Key="RectangleVectorDataSocketBrush" Color="{StaticResource RectangleDataSocketColor}" />

+ 4 - 0
src/PixiEditor/ViewModels/Nodes/NodePropertyViewModel.cs

@@ -181,6 +181,10 @@ internal abstract class NodePropertyViewModel : ViewModelBase, INodePropertyHand
             targetType = propertyType.GetMethod("Invoke").ReturnType;
             targetType = propertyType.GetMethod("Invoke").ReturnType;
         }
         }
 
 
+        if (targetType.IsEnum)
+        {
+            targetType = typeof(Enum);
+        }
         if (Application.Current.Styles.TryGetResource($"{targetType.Name}SocketBrush", App.Current.ActualThemeVariant,
         if (Application.Current.Styles.TryGetResource($"{targetType.Name}SocketBrush", App.Current.ActualThemeVariant,
                 out object brush))
                 out object brush))
         {
         {