Skip to content

Commit c849b47

Browse files
RomanSoloweowRomanSoloweow
committed
styles some refact
1 parent 0997943 commit c849b47

38 files changed

+257
-826
lines changed

‎SimpleStateMachineNodeEditor/App.xaml‎

Lines changed: 14 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
<ResourceDictionary Source="Images.xaml"/>
1010
<ResourceDictionary Source="Styles/Colors.xaml"/>
1111
<ResourceDictionary Source="Styles/Theme.xaml"/>
12-
<ResourceDictionary Source="Styles/ErrorList/ExpanderTemplate.xaml"/>
13-
<ResourceDictionary Source="Styles/ErrorList/TextBoxTemplate.xaml"/>
14-
<ResourceDictionary Source="Styles/ErrorList/ScrollBarTemplate.xaml"/>
15-
<ResourceDictionary Source="Styles/ErrorList/ScrollViewerTemplate.xaml"/>
12+
<ResourceDictionary Source="Styles/ErrorList/StyleExpander.xaml"/>
13+
<ResourceDictionary Source="Styles/ErrorList/StyleScrollBar.xaml"/>
14+
<ResourceDictionary Source="Styles/ErrorList/StyleScrollViewer.xaml"/>
1615

17-
<ResourceDictionary Source="Styles/ErrorList/ListBoxTemplate.xaml"/>
18-
<ResourceDictionary Source="Styles/ErrorList/LabelTemplate.xaml"/>
19-
<ResourceDictionary Source="Styles/ErrorList/ListBoxItemTemplate.xaml"/>
16+
<ResourceDictionary Source="Styles/ErrorList/TemplateListBox.xaml"/>
17+
<ResourceDictionary Source="Styles/ErrorList/StyleLabel.xaml"/>
18+
<ResourceDictionary Source="Styles/ErrorList/StyleListBoxItem.xaml"/>
2019
<!--#region Test-->
2120

2221
<!--#endregion Test-->
@@ -25,48 +24,14 @@
2524

2625
<!--#region Selector-->
2726

28-
<ResourceDictionary Source="Styles\SelectorStyle.xaml"/>
27+
<ResourceDictionary Source="Styles\StyleSelector.xaml"/>
2928

3029
<!--#endregion Selector-->
3130

3231
<!--#region Node-->
3332

34-
<!--#region LeftConnector-->
35-
36-
<!--#region LeftConnectorTextBox-->
37-
38-
<ResourceDictionary Source="Styles\Node\LeftConnector\LeftConnectorTextBoxStyle.xaml"/>
39-
40-
<!--#endregion LeftConnectorTextBox-->
41-
42-
<!--#region LeftConnectorEllipse-->
43-
44-
<ResourceDictionary Source="Styles\Node\LeftConnector\LeftConnectorEllipseStyle.xaml"/>
45-
46-
<!--#endregion LeftConnectorEllipse-->
47-
48-
<!--#endregion LeftConnector-->
49-
50-
<!--#region RightConnector-->
51-
52-
<!--#region RightConnectorTextBox-->
53-
54-
<ResourceDictionary Source="Styles\Node\RightConnector\RightConnectorTextBoxStyle.xaml"/>
55-
56-
<!--#endregion RightConnectorTextBox-->
57-
58-
<!--#region RightConnectorEllipse-->
59-
60-
<ResourceDictionary Source="Styles\Node\RightConnector\RightConnectorEllipseStyle.xaml"/>
61-
62-
<!--#endregion RightConnectorEllipse-->
63-
64-
<!--#endregion RightConnector-->
65-
66-
67-
<ResourceDictionary Source="Styles\Node\NodeBorderStyle.xaml"/>
68-
<ResourceDictionary Source="Styles\Node\NodeButtonRollUpStyle.xaml"/>
69-
<ResourceDictionary Source="Styles\Node\StyleNodeHeaderTextBox.xaml"/>
33+
<ResourceDictionary Source="Styles\Node\StyleNodeCollapseButton.xaml"/>
34+
<ResourceDictionary Source="Styles\StyleEmptyTextBox.xaml"/>
7035

7136
<!--#endregion Node-->
7237

@@ -78,7 +43,7 @@
7843
<!--#region Header-->
7944
<ResourceDictionary Source="Styles/MainWindow/ToolBar/ToolButtonTemplate.xaml"/>
8045
<ResourceDictionary Source="Styles/MainWindow/ToolBarTemplate.xaml"/>
81-
<ResourceDictionary Source="Styles/MainWindow/Header/HeaderButtonTemplate.xaml"/>
46+
<ResourceDictionary Source="Styles/MainWindow/Header/StyleHeaderButton.xaml"/>
8247

8348
<!--#endregion Header-->
8449

@@ -87,20 +52,20 @@
8752
<!--#region Menu-->
8853

8954
<ResourceDictionary Source="Styles/Menu/MenuTemplate.xaml"/>
90-
<ResourceDictionary Source="Styles/Menu/MenuItemStyle.xaml"/>
55+
<ResourceDictionary Source="Styles/Menu/StyleMenuItem.xaml"/>
9156

9257
<!--#endregion Menu-->
9358

9459
<!--#region ContextMenu-->
9560

96-
<ResourceDictionary Source="Styles/ContextMenu/ContextMenuTemplate.xaml"/>
97-
<ResourceDictionary Source="Styles/ContextMenu/ContextMenuItemStyle.xaml"/>
61+
<ResourceDictionary Source="Styles/ContextMenu/TemplateContextMenu.xaml"/>
62+
<ResourceDictionary Source="Styles/ContextMenu/StyleContextMenuItem.xaml"/>
9863

9964
<!--#endregion ContextMenu-->
10065

10166
<!--#region Tabs-->
10267

103-
<ResourceDictionary Source="Styles/Tabs/TabItemTemplate.xaml"/>
68+
<ResourceDictionary Source="Styles/Tabs/StyleTabItem.xaml"/>
10469

10570
<!--#endregion Tabs-->
10671

‎SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj‎

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

56-
<ItemGroup>
57-
<Page Update="Styles\Node\RightConnector\RightConnectorEllipseStyle.xaml">
58-
<SubType>Designer</SubType>
59-
</Page>
60-
<Page Update="Styles\Node\RightConnector\RightConnectorTextBoxStyle.xaml">
61-
<SubType>Designer</SubType>
62-
</Page>
63-
</ItemGroup>
64-
6556
</Project>

‎SimpleStateMachineNodeEditor/Styles/Colors.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<SolidColorBrush x:Shared="False" x:Key="ColorElement" Color="White"/>
1010

1111

12-
12+
<SolidColorBrush x:Key="ColorHeaderButton" Color="LightGray"/>
1313

1414
<!--#endregion Main-->
1515

@@ -213,7 +213,7 @@
213213
<SolidColorBrush x:Key="ColorNodeHeaderStaticBackground" Color="#FF123D6A"/>
214214
<SolidColorBrush x:Key="ColorNodeHeaderStaticBorder" Color="#FFABAdB3"/>
215215
<SolidColorBrush x:Key="ColorNodeHeaderMouseOverBorder" Color="#FF7EB4EA"/>
216-
<SolidColorBrush x:Key="ColorNodeHeaderFocusBorder" Color="#FF569DE5"/>
216+
<SolidColorBrush x:Key="ColorNodeHeaderFocusBorder" Color="Pink"/>
217217

218218
<!--#endregion Header-->
219219

SimpleStateMachineNodeEditor/Styles/ContextMenu/ContextMenuItemStyle.xaml renamed to SimpleStateMachineNodeEditor/Styles/ContextMenu/StyleContextMenuItem.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
33

4-
<Style x:Key="ContextMenuItemStyle" TargetType="{x:Type MenuItem}">
4+
<Style x:Key="StyleContextMenuItem" TargetType="{x:Type MenuItem}">
55
<Setter Property="Foreground" Value="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ContextMenu}}}" />
66
<Setter Property="Template">
77
<Setter.Value>

SimpleStateMachineNodeEditor/Styles/ContextMenu/ContextMenuTemplate.xaml renamed to SimpleStateMachineNodeEditor/Styles/ContextMenu/TemplateContextMenu.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
44

5-
<ControlTemplate x:Key="ContextMenuTemplate" TargetType="{x:Type ContextMenu}">
5+
<ControlTemplate x:Key="TemplateContextMenu" TargetType="{x:Type ContextMenu}">
66
<Border SnapsToDevicePixels="true" Margin="0,0,5,5" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
77
<Border.Effect>
88
<DropShadowEffect BlurRadius="5" Opacity="0.4"/>

0 commit comments

Comments
 (0)