Skip to content

Commit 3993ed3

Browse files
RomanSoloweowRomanSoloweow
committed
Merge branch 'develop'
2 parents 1bc138f + 8c2e9a0 commit 3993ed3

File tree

74 files changed

+728
-779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+728
-779
lines changed

‎SimpleStateMachineNodeEditor/Helpers/Enums/Themes.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace SimpleStateMachineNodeEditor.Helpers.Enums
6+
{
7+
public enum Themes
8+
{
9+
noCorrect = 0,
10+
Light,
11+
Dark
12+
}
13+
}

‎SimpleStateMachineNodeEditor/Helpers/Logging/WithLogging.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎SimpleStateMachineNodeEditor/Helpers/MyPoint.cs‎

Lines changed: 0 additions & 179 deletions
This file was deleted.

‎SimpleStateMachineNodeEditor/Icons/AddNode.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="{StaticResource ColorIconsMain}" Geometry="F1M15,3L15,15 1,15 1,6 2,6 2,14 14,14 14,6 8,6 8,3z" />
7+
<GeometryDrawing Brush="{DynamicResource ColorIconsMain}" Geometry="F1M15,3L15,15 1,15 1,6 2,6 2,14 14,14 14,6 8,6 8,3z" />
88
<GeometryDrawing Brush="#FF388A34" Geometry="F1M7,3.0181L5,3.0181 5,1.0001 3.019,1.0001 3.019,3.0181 1,3.0181 1,5.0001 3.019,5.0001 3.019,7.0001 5,7.0001 5,5.0001 7,5.0001z" />
99
</DrawingGroup.Children>
1010
</DrawingGroup>

‎SimpleStateMachineNodeEditor/Icons/Close.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="{StaticResource ColorWindowHeaderButtonsIcon}" Geometry="F1M8.583,8L13,12.424 12.424,13 8,8.583 3.576,13 3,12.424 7.417,8 3,3.576 3.576,3 8,7.417 12.424,3 13,3.576z"/>
7+
<GeometryDrawing Brush="{DynamicResource ColorWindowHeaderButtonsIcon}" Geometry="F1M8.583,8L13,12.424 12.424,13 8,8.583 3.576,13 3,12.424 7.417,8 3,3.576 3.576,3 8,7.417 12.424,3 13,3.576z"/>
88
</DrawingGroup.Children>
99
</DrawingGroup>
1010
</DrawingBrush.Drawing>

‎SimpleStateMachineNodeEditor/Icons/CollapseUp.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<DrawingGroup>
66
<DrawingGroup.Children>
77
<GeometryDrawing Brush="#00FFFFFF" Geometry="M8,4L13,9 14,8 8,2 2,8 3,9z" />
8-
<GeometryDrawing Brush="{StaticResource ColorIconsSecond}" Geometry="F1M8,8L13,13 14,12 8,6 2,12 3,13z " />
8+
<GeometryDrawing Brush="{DynamicResource ColorIconsSecond}" Geometry="F1M8,8L13,13 14,12 8,6 2,12 3,13z " />
99

1010
</DrawingGroup.Children>
1111
</DrawingGroup>

‎SimpleStateMachineNodeEditor/Icons/CollapseUpAll.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="{StaticResource ColorIconsMain}" Geometry="F1M8,8L13,13 14,12 8,6 2,12 3,13z M8,4L13,9 14,8 8,2 2,8 3,9z" />
7+
<GeometryDrawing Brush="{DynamicResource ColorIconsMain}" Geometry="F1M8,8L13,13 14,12 8,6 2,12 3,13z M8,4L13,9 14,8 8,2 2,8 3,9z" />
88
</DrawingGroup.Children>
99
</DrawingGroup>
1010
</DrawingBrush.Drawing>

‎SimpleStateMachineNodeEditor/Icons/Copy.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="{StaticResource ColorIconsMain}" Geometry="M20.6,0H8l0,1.5V6H4.1L2.8,6v18l1.3,0h10.2l1.2,0v-6h4l1.1,0V4.5V0z M14.3,22.5H4.1v-15h3.8v9.1l0,1.4h6.3V22.5z M19.4,16.5H9.2v-15h10.2V16.5z"/>
7+
<GeometryDrawing Brush="{DynamicResource ColorIconsMain}" Geometry="M20.6,0H8l0,1.5V6H4.1L2.8,6v18l1.3,0h10.2l1.2,0v-6h4l1.1,0V4.5V0z M14.3,22.5H4.1v-15h3.8v9.1l0,1.4h6.3V22.5z M19.4,16.5H9.2v-15h10.2V16.5z"/>
88
</DrawingGroup.Children>
99
</DrawingGroup>
1010
</DrawingBrush.Drawing>

‎SimpleStateMachineNodeEditor/Icons/DeleteScheme.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="{StaticResource ColorIconsMain}" Geometry="F1M14,6L9,6 9,3 14,3z M8,14L3,14 3,11 8,11z M8,1L8,7 12,7 12,12 9,12 9,9 2,9 2,15 9,15 9,13 13,13 13,7 15,7 15,1z" />
7+
<GeometryDrawing Brush="{DynamicResource ColorIconsMain}" Geometry="F1M14,6L9,6 9,3 14,3z M8,14L3,14 3,11 8,11z M8,1L8,7 12,7 12,12 9,12 9,9 2,9 2,15 9,15 9,13 13,13 13,7 15,7 15,1z" />
88
<GeometryDrawing Brush="#FFA1260D" Geometry="F1M3.9699,2.9698L1.9999,0.999799999999999 0.9399,2.0608 2.9089,4.0298 0.9399,5.9998 1.9999,7.0598 3.9699,5.0908 5.9389,7.0598 6.9999,5.9998 5.0299,4.0298 6.9999,2.0608 5.9389,0.999799999999999z" />
99
</DrawingGroup.Children>
1010
</DrawingGroup>

‎SimpleStateMachineNodeEditor/Icons/ErrorList.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DrawingBrush.Drawing>
55
<DrawingGroup>
66
<DrawingGroup.Children>
7-
<GeometryDrawing Brush="{StaticResource ColorIconsMain}" Geometry="M2 10V9H14V10H2ZM2 6H14V7H2V6ZM14 3V4H2V3H14Z" />
7+
<GeometryDrawing Brush="{DynamicResource ColorIconsMain}" Geometry="M2 10V9H14V10H2ZM2 6H14V7H2V6ZM14 3V4H2V3H14Z" />
88
</DrawingGroup.Children>
99
</DrawingGroup>
1010
</DrawingBrush.Drawing>

0 commit comments

Comments
 (0)