Skip to content

Commit be7e9cb

Browse files
RomanSoloweowRomanSoloweow
committed
light theme
1 parent 3cd18a8 commit be7e9cb

18 files changed

+184
-43
lines changed

‎SimpleStateMachineNodeEditor/App.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<ResourceDictionary Source="Styles/MainWindow/ToolBar/ToolButtonTemplate.xaml"/>
4545
<ResourceDictionary Source="Styles/MainWindow/ToolBarTemplate.xaml"/>
4646
<ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButton.xaml"/>
47-
47+
<ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButtonPath.xaml"/>
48+
<ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButtonClosePath.xaml"/>
4849
<!--#endregion Header-->
4950

5051
<!--#endregion MainWindow-->

‎SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,10 @@
5353
<PackageReference Include="Splat.Drawing" Version="9.4.5" />
5454
</ItemGroup>
5555

56+
<ItemGroup>
57+
<Page Update="Styles\MainWindow\Header\StyleHeaderButtonClosePath.xaml">
58+
<SubType>Designer</SubType>
59+
</Page>
60+
</ItemGroup>
61+
5662
</Project>

‎SimpleStateMachineNodeEditor/Styles/Colors.xaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
33

4-
5-
64
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/Styles/ErrorList/StyleLabel.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<Setter Property="Padding" Value="0"/>
88
<Setter Property="HorizontalContentAlignment" Value="Left"/>
99
<Setter Property="VerticalContentAlignment" Value="Top"/>
10-
<Setter Property="Foreground" Value="LightGray"/>
11-
10+
<Setter Property="Foreground" Value="{StaticResource ColorMessagesForeground}"/>
11+
1212
<Setter Property="Template">
1313
<Setter.Value>
1414
<ControlTemplate TargetType="{x:Type Label}">

‎SimpleStateMachineNodeEditor/Styles/ErrorList/StyleListBoxItem.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</Border>
1212
<ControlTemplate.Triggers>
1313
<Trigger Property="IsSelected" Value="true">
14-
<Setter TargetName="Border" Property="Background" Value="{Binding OpacityMask, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
14+
<Setter TargetName="Border" Property="Background" Value="{StaticResource ColorElementMouseOver}"/>
15+
<Setter Property="Foreground" Value="{StaticResource ColorMessagesForegroundSelected}"/>
1516
</Trigger>
1617
</ControlTemplate.Triggers>
1718
</ControlTemplate>

‎SimpleStateMachineNodeEditor/Styles/MainWindow/Header/StyleHeaderButtonClosePath.xaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
4+
<Style x:Key="StyleHeaderButtonClosePath" TargetType="{x:Type Path}">
5+
<Setter Property="Stroke" Value="{StaticResource ColorButtonStroke}"/>
6+
<Style.Triggers>
7+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=IsMouseOver}" Value="True">
8+
<Setter Property="Stroke" Value="{StaticResource ColorWindowHeaderButtonClosePathStrokeMouseOver}" />
9+
</DataTrigger>
10+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=IsPressed}" Value="True">
11+
<Setter Property="Stroke" Value="{StaticResource ColorWindowHeaderButtonClosePathStrokePressed}" />
12+
</DataTrigger >
13+
</Style.Triggers>
14+
</Style>
15+
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/Styles/MainWindow/Header/StyleHeaderButtonPath.xaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
4+
<Style x:Key="StyleHeaderButtonPath" TargetType="{x:Type Path}">
5+
<Setter Property="Stroke" Value="{StaticResource ColorButtonStroke}"/>
6+
<Style.Triggers>
7+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=IsMouseOver}" Value="True">
8+
<Setter Property="Stroke" Value="{StaticResource ColorWindowHeaderButtonPathStrokeMouseOver}" />
9+
</DataTrigger>
10+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=IsPressed}" Value="True">
11+
<Setter Property="Stroke" Value="{StaticResource ColorWindowHeaderButtonPathStrokePressed}" />
12+
</DataTrigger >
13+
</Style.Triggers>
14+
</Style>
15+
</ResourceDictionary>

‎SimpleStateMachineNodeEditor/Styles/MainWindow/ToolBarTemplate.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
</Border>
7272
<ControlTemplate.Triggers>
7373
<Trigger Property="IsMouseOver" Value="true">
74-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource ColorHeaderButtonBackgroundMouseOver}"/>
75-
<Setter Property="Stroke" TargetName="BdLine" Value="{StaticResource ColorHeaderButtonBackgroundPressed}"/>
76-
<Setter Property="Fill" TargetName="BdArrow" Value="{StaticResource ColorHeaderButtonBackgroundPressed}"/>
74+
<Setter Property="Background" TargetName="Bd" Value="{StaticResource ColorWindowHeaderButtonBackgroundMouseOver}"/>
75+
<Setter Property="Stroke" TargetName="BdLine" Value="{StaticResource ColorWindowHeaderButtonBackgroundPressed}"/>
76+
<Setter Property="Fill" TargetName="BdArrow" Value="{StaticResource ColorWindowHeaderButtonBackgroundPressed}"/>
7777
</Trigger>
7878
<Trigger Property="IsKeyboardFocused" Value="true">
79-
<Setter Property="Background" TargetName="Bd" Value="{StaticResource ColorHeaderButtonBackgroundMouseOver}"/>
80-
<Setter Property="Stroke" TargetName="BdLine" Value="{StaticResource ColorHeaderButtonBackgroundPressed}"/>
81-
<Setter Property="Fill" TargetName="BdArrow" Value="{StaticResource ColorHeaderButtonBackgroundPressed}"/>
79+
<Setter Property="Background" TargetName="Bd" Value="{StaticResource ColorWindowHeaderButtonBackgroundMouseOver}"/>
80+
<Setter Property="Stroke" TargetName="BdLine" Value="{StaticResource ColorWindowHeaderButtonBackgroundPressed}"/>
81+
<Setter Property="Fill" TargetName="BdArrow" Value="{StaticResource ColorWindowHeaderButtonBackgroundPressed}"/>
8282
</Trigger>
8383
</ControlTemplate.Triggers>
8484
</ControlTemplate>

‎SimpleStateMachineNodeEditor/Styles/Node/ElementNodeHeader.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Grid.RowDefinitions>
1616
<RowDefinition />
1717
</Grid.RowDefinitions>
18-
<TextBox Name="TextBox" Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" Style="{StaticResource StyleEmptyTextBox}" HorizontalContentAlignment="Center" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{StaticResource ColorForeground}" Padding="10,2,0,2" ScrollViewer.CanContentScroll="True" HorizontalAlignment="Center" />
18+
<TextBox Name="TextBox" Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" Style="{StaticResource StyleEmptyTextBox}" HorizontalContentAlignment="Center" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{StaticResource ColorNodeHeaderForeground}" Padding="10,2,0,2" ScrollViewer.CanContentScroll="True" HorizontalAlignment="Center" />
1919
<Button Name ="ButtonCollapse" Grid.Column="1" Style="{StaticResource StyleNodeCollapseButton}" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5">
2020
<Button.RenderTransform>
2121
<TransformGroup>

‎SimpleStateMachineNodeEditor/Styles/Theme.xaml‎

Lines changed: 106 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,117 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.Styles">
44

5-
<SolidColorBrush x:Key="ColorForeground" Color="White"/>
5+
<SolidColorBrush x:Key="ColorForeground" Color="Green"/>
6+
7+
<!--#region Selector-->
8+
9+
<SolidColorBrush x:Key="ColorScrollBarBackground" Color="White"/>
10+
<SolidColorBrush x:Key="ColorScrollBarThumb" Color="#c2c3c9"/>
11+
12+
<!--#endregion Selector-->
13+
<SolidColorBrush x:Key="ColorElementMouseOver" Color="#007acc"/>
14+
15+
<SolidColorBrush x:Key="ColorSelectedElement" Color="#D23030"/>
16+
17+
<SolidColorBrush x:Key="ColorConnect" Color="#d7d7e2"/>
18+
19+
<SolidColorBrush x:Key="ColorConnector" Color="#d7d7e2"/>
20+
21+
<SolidColorBrush x:Key="ColorConnectorForeground" Color="Black"/>
22+
23+
<SolidColorBrush x:Key="ColorCutter" Color="Red"/><!--changed-->
24+
25+
<SolidColorBrush x:Key="ColorButtonStroke" Color="#626264"/>
26+
27+
<SolidColorBrush x:Key="ColorNodesCanvasBackground" Color="White"/> <!--changed-->
28+
29+
<!--#region Selector-->
30+
31+
<SolidColorBrush x:Key="ColorSelectorFill" Color="#aaccee" />
32+
<SolidColorBrush x:Key="ColorSelectorStroke" Color="#8f8f91"/>
33+
34+
<!--#endregion Selector-->
35+
36+
<!--#region Messages-->
37+
38+
<SolidColorBrush x:Key="ColorMessagesBackground" Color="#f5f5f5"/>
39+
<SolidColorBrush x:Key="ColorMessagesBorder" Color="#cccedb"/>
40+
<SolidColorBrush x:Key="ColorMessagesForeground" Color="Black"/>
41+
<SolidColorBrush x:Key="ColorMessagesForegroundSelected" Color="White"/>
42+
43+
<!--#endregion Messages-->
44+
45+
<!--#region Window-->
46+
<SolidColorBrush x:Key="ColorWindowBackground" Color="#FF212121"/>
47+
<SolidColorBrush x:Key="ColorWindowBorder" Color="LightGray"/>
48+
<SolidColorBrush x:Key="ColorWindowHeader" Color="#eeeef2"/>
49+
<SolidColorBrush x:Key="ColorWindowHeaderTabItemForeground" Color="White"/>
50+
51+
<!--#region Header buttons-->
52+
53+
<SolidColorBrush x:Key="ColorWindowHeaderButtonCloseBackgroundPressed" Color="#a3232d"/>
54+
<SolidColorBrush x:Key="ColorWindowHeaderButtonClosePathStrokePressed" Color="White"/>
55+
<SolidColorBrush x:Key="ColorWindowHeaderButtonCloseBackgroundMouseOver" Color="#e81123"/>
56+
<SolidColorBrush x:Key="ColorWindowHeaderButtonClosePathStrokeMouseOver" Color="White"/>
57+
58+
<SolidColorBrush x:Key="ColorWindowHeaderButtonBackgroundPressed" Color="#007acc"/>
59+
<SolidColorBrush x:Key="ColorWindowHeaderButtonPathStrokePressed" Color="White"/>
60+
<SolidColorBrush x:Key="ColorWindowHeaderButtonBackgroundMouseOver" Color="White"/>
61+
<SolidColorBrush x:Key="ColorWindowHeaderButtonPathStrokeMouseOver" Color="#007acc"/>
62+
63+
<!--#endregion Header buttons-->
64+
65+
<!--#endregion Window-->
66+
67+
<!--#region Menu-->
68+
<SolidColorBrush x:Key="ColorMenuBorder" Color="LightGray"/><!--changed-->
69+
<SolidColorBrush x:Key="ColorMenuBackground" Color="#f6f6f6"/><!--changed-->
70+
<SolidColorBrush x:Key="ColorMenuForeground" Color="Black"/><!--changed-->
71+
<SolidColorBrush x:Key="ColorMenuBackgroundMouseOver" Color="#c9def5"/><!--changed-->
72+
<!--#endregion Menu-->
73+
74+
<!--#region Node-->
75+
<SolidColorBrush x:Key="ColorNodeBackground" Color="#fcfcfd"/><!--changed-->
76+
<SolidColorBrush x:Key="ColorNodeBorderBrush" Color="#d7d7e2"/><!--changed-->
77+
78+
<SolidColorBrush x:Key="ColorNodeHeader" Color="#f0f0f0"/><!--changed-->
79+
<SolidColorBrush x:Key="ColorNodeHeaderForeground" Color="Black"/><!--changed-->
80+
81+
<SolidColorBrush x:Key="ColorNodeCollapseButtonBackground" Color="#d7d7e2"/>
82+
<SolidColorBrush x:Key="ColorNodeCollapseButtonBorderBrush" Color="#d7d7e2"/>
83+
84+
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBackground" Color="#D23030"/>
85+
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBorderBrush" Color="#D23030"/>
86+
<!--#endregion Node-->
87+
88+
<DrawingBrush x:Key="ColorRightConnectorEllipseLoop" TileMode="Tile">
89+
<DrawingBrush.Drawing>
90+
<GeometryDrawing Brush="{StaticResource ColorConnector}">
91+
<GeometryDrawing.Geometry >
92+
<PathGeometry Figures="M 515.216,32.2104 C 471.039,64.9407 316.749,210.919 285,241.156 354.528,309.155 476.402,421.505 519.933,456.569 529.209,459.558 539.111,457.671 546.19,451.542 555.782,443.051 556.092,441.322 556.092,390.691 L 556.092,345.094 623.066,352.167 C 685.164,363.02 743.338,384.245 783.587,410.973 803.716,424.34 824.621,444.779 836.101,462.072 880.591,529.527 843.806,607.354 743.497,657.827 729.504,664.899 727.459,667.262 727.459,676.538 727.459,685.029 733.429,691 741.919,691 753.399,691 811.097,665.843 844.894,646.188 927.43,597.919 979,534.238 990.947,466.004 994.562,444.938 993.302,412.543 987.959,392.261 955.415,268.204 795.052,169.621 581.556,142.267 L 556.877,139.119 C 556.409,139.119 556.092,119.148 556.092,94.7828 556.092,52.9599 555.933,50.1294 552.794,43.6835 546.348,30.4748 528.265,24.9723 515.216,32.2104 Z" FillRule="Nonzero" >
93+
<PathGeometry.Transform>
94+
<ScaleTransform ScaleX="0.95" ScaleY="0.95"/>
95+
</PathGeometry.Transform>
96+
</PathGeometry>
97+
</GeometryDrawing.Geometry>
98+
</GeometryDrawing>
99+
</DrawingBrush.Drawing>
100+
</DrawingBrush>
101+
102+
103+
<!--<SolidColorBrush x:Key="ColorForeground" Color="White"/>
6104
7105
<SolidColorBrush x:Key="ColorScrollBarBackground" Color="#3e3e42"/>
8106
<SolidColorBrush x:Key="ColorScrollBarThumb" Color="#1e1e1e"/>
9107
10108
<SolidColorBrush x:Key="ColorElementMouseOver" Color="#007acc"/>
11109
12110
<SolidColorBrush x:Key="ColorSelectedElement" Color="#D23030"/>
13-
<SolidColorBrush x:Key="ColorButtonCloseBackgroundPressed" Color="#a3232d"/>
14-
<SolidColorBrush x:Key="ColorButtonCloseBackgroundMouseOver" Color="#e81123"/>
111+
<SolidColorBrush x:Key="ColorWindowHeaderButtonCloseBackgroundPressed" Color="#a3232d"/>
112+
<SolidColorBrush x:Key="ColorWindowButtonCloseBackgroundMouseOver" Color="#e81123"/>
15113
16-
<SolidColorBrush x:Key="ColorHeaderButtonBackgroundPressed" Color="#007acc"/>
17-
<SolidColorBrush x:Key="ColorHeaderButtonBackgroundMouseOver" Color="#444549"/>
114+
<SolidColorBrush x:Key="ColorWindowHeaderButtonBackgroundPressed" Color="#007acc"/>
115+
<SolidColorBrush x:Key="ColorWindowHeaderButtonBackgroundMouseOver" Color="#444549"/>
18116
19117
<SolidColorBrush x:Key="ColorConnect" Color="White"/>
20118
@@ -54,12 +152,12 @@
54152
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBackground" Color="#D23030"/>
55153
<SolidColorBrush x:Key="ColorNodeCollapseButtonMouseOverBorderBrush" Color="#D23030"/>
56154
57-
155+
58156
59157
60158
<DrawingBrush x:Key="ColorRightConnectorEllipseLoop" TileMode="Tile">
61159
<DrawingBrush.Drawing>
62-
<GeometryDrawing Brush="White">
160+
<GeometryDrawing Brush="{StaticResource ColorConnector}">
63161
<GeometryDrawing.Geometry >
64162
<PathGeometry Figures="M 515.216,32.2104 C 471.039,64.9407 316.749,210.919 285,241.156 354.528,309.155 476.402,421.505 519.933,456.569 529.209,459.558 539.111,457.671 546.19,451.542 555.782,443.051 556.092,441.322 556.092,390.691 L 556.092,345.094 623.066,352.167 C 685.164,363.02 743.338,384.245 783.587,410.973 803.716,424.34 824.621,444.779 836.101,462.072 880.591,529.527 843.806,607.354 743.497,657.827 729.504,664.899 727.459,667.262 727.459,676.538 727.459,685.029 733.429,691 741.919,691 753.399,691 811.097,665.843 844.894,646.188 927.43,597.919 979,534.238 990.947,466.004 994.562,444.938 993.302,412.543 987.959,392.261 955.415,268.204 795.052,169.621 581.556,142.267 L 556.877,139.119 C 556.409,139.119 556.092,119.148 556.092,94.7828 556.092,52.9599 555.933,50.1294 552.794,43.6835 546.348,30.4748 528.265,24.9723 515.216,32.2104 Z" FillRule="Nonzero" >
65163
<PathGeometry.Transform>
@@ -69,7 +167,7 @@
69167
</GeometryDrawing.Geometry>
70168
</GeometryDrawing>
71169
</DrawingBrush.Drawing>
72-
</DrawingBrush>
170+
</DrawingBrush>-->
73171

74172

75173
</ResourceDictionary>

0 commit comments

Comments
 (0)