Skip to content

Commit e88c4af

Browse files
RomanSoloweowRomanSoloweow
committed
for static
1 parent e51aa7c commit e88c4af

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

‎SimpleStateMachineNodeEditor/App.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<ResourceDictionary Source="Styles/ErrorList/ScrollViewerTemplate.xaml"/>
1414
<ResourceDictionary Source="Styles/ErrorList/ScrollBarTemplate.xaml"/>
1515
<ResourceDictionary Source="Styles/ErrorList/ListBoxTemplate.xaml"/>
16-
<ResourceDictionary Source="Styles/ErrorList/ListBoxItemTemplate.xaml"/>
1716
<ResourceDictionary Source="Styles/ErrorList/LabelTemplate.xaml"/>
17+
<ResourceDictionary Source="Styles/ErrorList/ListBoxItemTemplate.xaml"/>
1818
<!--#region Test-->
1919

2020
<!--#endregion Test-->

‎SimpleStateMachineNodeEditor/Styles/ErrorList/ListBoxItemTemplate.xaml‎

Lines changed: 2 additions & 2 deletions
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"
3-
xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.Styles.ErrorList">
4-
<Style x:Key="_ListBoxItemStyle" TargetType="ListBoxItem">
3+
>
4+
<Style x:Key="ListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
55
<Setter Property="Template">
66
<Setter.Value>
77
<ControlTemplate TargetType="ListBoxItem">

‎SimpleStateMachineNodeEditor/View/MainWindow.xaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
xmlns:view="clr-namespace:SimpleStateMachineNodeEditor.View" xmlns:sys1="clr-namespace:System;assembly=System.Runtime"
1111
x:Class="SimpleStateMachineNodeEditor.View.MainWindow"
1212
mc:Ignorable="d"
13-
Title="MainWindow" d:DesignWidth="808.96" Height="738.592" BorderThickness="1" Padding="7,0,7,7" ResizeMode="CanResizeWithGrip" BorderBrush="{DynamicResource ColorWindowBorder}" Background="{DynamicResource ColorWindowHeader}" Foreground="{x:Null}" WindowStyle="None" AllowsTransparency="True" Style="{DynamicResource CustomWindowStyle}">
14-
<Grid Background="{DynamicResource ColorWindowHeader}">
13+
Title="MainWindow" d:DesignWidth="808.96" Height="738.592" BorderThickness="1" Padding="7,0,7,7" ResizeMode="CanResizeWithGrip" BorderBrush="{StaticResource ColorWindowBorder}" Background="{StaticResource ColorWindowHeader}" Foreground="{x:Null}" WindowStyle="None" AllowsTransparency="True" Style="{StaticResource CustomWindowStyle}">
14+
<Grid Background="{StaticResource ColorWindowHeader}">
1515
<Grid.RowDefinitions>
1616
<RowDefinition Height="auto"></RowDefinition>
1717
<RowDefinition Height="auto"></RowDefinition>
@@ -20,50 +20,50 @@
2020
<RowDefinition Height="auto" x:Name="Fotter" MinHeight="18"></RowDefinition>
2121
</Grid.RowDefinitions>
2222
<DockPanel x:Name="Header" Grid.Row="0" Background="{StaticResource ColorWindowHeader}" LastChildFill="False">
23-
<Menu Background="{DynamicResource ColorMenuBaground}" Foreground="White" BorderBrush="{DynamicResource ColorMenuBorder}" OpacityMask="{DynamicResource ColorHeaderButtonIsMouseOver}" Template="{DynamicResource MenuTemplate}" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center">
24-
<MenuItem Header="File" x:Name="Item" Style="{DynamicResource MenuItemStyle}">
25-
<MenuItem Header="New" x:Name="ItemNew" Style="{DynamicResource MenuItemStyle}" />
26-
<MenuItem Header="Open" x:Name="ItemOpen" Style="{DynamicResource MenuItemStyle}" />
23+
<Menu Background="{StaticResource ColorMenuBaground}" Foreground="White" BorderBrush="{StaticResource ColorMenuBorder}" OpacityMask="{StaticResource ColorHeaderButtonIsMouseOver}" Template="{StaticResource MenuTemplate}" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center">
24+
<MenuItem Header="File" x:Name="Item" Style="{StaticResource MenuItemStyle}">
25+
<MenuItem Header="New" x:Name="ItemNew" Style="{StaticResource MenuItemStyle}" />
26+
<MenuItem Header="Open" x:Name="ItemOpen" Style="{StaticResource MenuItemStyle}" />
2727
<!--<MenuItem.Icon>
2828
<Path></Path>
2929
</MenuItem.Icon>-->
30-
<MenuItem Header="Save" InputGestureText="Ctrl + S" x:Name="ItemSave" Style="{DynamicResource MenuItemStyle}"/>
31-
<MenuItem Header="SaveAs..." x:Name="ItemSaveAs" Style="{DynamicResource MenuItemStyle}"/>
32-
<MenuItem Header="Export" x:Name="ItemExport" Style="{DynamicResource MenuItemStyle}">
33-
<MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{DynamicResource MenuItemStyle}"/>
34-
<MenuItem Header="Export to JPEG" x:Name="ItemExportToJPEG" Style="{DynamicResource MenuItemStyle}"/>
30+
<MenuItem Header="Save" InputGestureText="Ctrl + S" x:Name="ItemSave" Style="{StaticResource MenuItemStyle}"/>
31+
<MenuItem Header="SaveAs..." x:Name="ItemSaveAs" Style="{StaticResource MenuItemStyle}"/>
32+
<MenuItem Header="Export" x:Name="ItemExport" Style="{StaticResource MenuItemStyle}">
33+
<MenuItem Header="Export to PNG" x:Name="ItemExportToPNG" Style="{StaticResource MenuItemStyle}"/>
34+
<MenuItem Header="Export to JPEG" x:Name="ItemExportToJPEG" Style="{StaticResource MenuItemStyle}"/>
3535
</MenuItem>
36-
<MenuItem Header="Exit" x:Name="ItemExit" InputGestureText="Alt + F4" Style="{DynamicResource MenuItemStyle}"/>
36+
<MenuItem Header="Exit" x:Name="ItemExit" InputGestureText="Alt + F4" Style="{StaticResource MenuItemStyle}"/>
3737
</MenuItem>
38-
<MenuItem Header="Edit" x:Name="ItemEdit" Style="{DynamicResource MenuItemStyle}">
39-
<MenuItem Header="Undo" x:Name="ItemUndo" InputGestureText="Ctrl + Z" Style="{DynamicResource MenuItemStyle}"/>
40-
<MenuItem Header="Redo" x:Name="ItemRedo" InputGestureText="Ctrl + Y" Style="{DynamicResource MenuItemStyle}"/>
41-
<MenuItem Header="Cut" x:Name="ItemCut" Style="{DynamicResource MenuItemStyle}"/>
42-
<MenuItem Header="Copy" x:Name="ItemCopy" Style="{DynamicResource MenuItemStyle}"/>
43-
<MenuItem Header="Paste" x:Name="ItemPaste" Style="{DynamicResource MenuItemStyle}"/>
38+
<MenuItem Header="Edit" x:Name="ItemEdit" Style="{StaticResource MenuItemStyle}">
39+
<MenuItem Header="Undo" x:Name="ItemUndo" InputGestureText="Ctrl + Z" Style="{StaticResource MenuItemStyle}"/>
40+
<MenuItem Header="Redo" x:Name="ItemRedo" InputGestureText="Ctrl + Y" Style="{StaticResource MenuItemStyle}"/>
41+
<MenuItem Header="Cut" x:Name="ItemCut" Style="{StaticResource MenuItemStyle}"/>
42+
<MenuItem Header="Copy" x:Name="ItemCopy" Style="{StaticResource MenuItemStyle}"/>
43+
<MenuItem Header="Paste" x:Name="ItemPaste" Style="{StaticResource MenuItemStyle}"/>
4444
</MenuItem>
4545
</Menu>
4646

4747
<!--BorderBrush - it's color on IsMouseOver, Foreground - it's color on IsPressed-->
48-
<Button DockPanel.Dock="Right" x:Name="ButtonClose" Style="{DynamicResource HeaderButtonTemplate}" Background="{StaticResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorButtonCloseIsMouseOver}" Foreground="{DynamicResource ColorButtonCloseIsPressed}" Padding="7" Grid.IsSharedSizeScope="True" Margin="0,0,-7,0">
48+
<Button DockPanel.Dock="Right" x:Name="ButtonClose" Style="{StaticResource HeaderButtonTemplate}" Background="{StaticResource ColorWindowHeader}" BorderBrush="{StaticResource ColorButtonCloseIsMouseOver}" Foreground="{StaticResource ColorButtonCloseIsPressed}" Padding="7" Grid.IsSharedSizeScope="True" Margin="0,0,-7,0">
4949
<Path x:Name="ButtonClosePath"
50-
Stroke="{DynamicResource ColorHeaderButton}"
50+
Stroke="{StaticResource ColorHeaderButton}"
5151
StrokeThickness="1.1"
5252
Stretch="None"
5353
Data="M2,2 L13,13 M13,2 L2,13">
5454
</Path>
5555
</Button>
56-
<Button DockPanel.Dock="Right" x:Name="ButtonMax" Style="{DynamicResource HeaderButtonTemplate}" Background="{StaticResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorHeaderButtonIsMouseOver}" Foreground="{DynamicResource ColorHeaderButtonIsPressed}">
56+
<Button DockPanel.Dock="Right" x:Name="ButtonMax" Style="{StaticResource HeaderButtonTemplate}" Background="{StaticResource ColorWindowHeader}" BorderBrush="{StaticResource ColorHeaderButtonIsMouseOver}" Foreground="{StaticResource ColorHeaderButtonIsPressed}">
5757
<Path x:Name="MaxButtonPath"
5858
StrokeThickness="1"
59-
Stroke="{DynamicResource ColorHeaderButton}"
59+
Stroke="{StaticResource ColorHeaderButton}"
6060
Stretch="None"
6161
Data="M0.5,0 V9.5 H13.5 V0 H0.5 V1 H13 V0 H0.5 V2 H13 " >
6262
</Path>
6363
</Button>
64-
<Button DockPanel.Dock="Right" x:Name="ButtonMin" Style="{DynamicResource HeaderButtonTemplate}" Background="{StaticResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorHeaderButtonIsMouseOver}" Foreground="{DynamicResource ColorHeaderButtonIsPressed}" >
64+
<Button DockPanel.Dock="Right" x:Name="ButtonMin" Style="{StaticResource HeaderButtonTemplate}" Background="{StaticResource ColorWindowHeader}" BorderBrush="{StaticResource ColorHeaderButtonIsMouseOver}" Foreground="{StaticResource ColorHeaderButtonIsPressed}" >
6565
<Path x:Name="ButtonMinPath"
66-
Stroke="{DynamicResource ColorHeaderButton}"
66+
Stroke="{StaticResource ColorHeaderButton}"
6767
StrokeThickness="1.2"
6868
Stretch="None"
6969
Data="M0,0 H11">
@@ -72,7 +72,7 @@
7272
<Button DockPanel.Dock="Right" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{x:Null}" />
7373
</DockPanel>
7474
<ToolBarTray Grid.Row="1" IsLocked="True" Background="{x:Null}">
75-
<ToolBar Style="{DynamicResource ToolBarTemplate}" Background="{x:Null}" Foreground="{x:Null}" >
75+
<ToolBar Style="{StaticResource ToolBarTemplate}" Background="{x:Null}" Foreground="{x:Null}" >
7676
<!--<Button Background="{StaticResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorButtonMaxIsMouseOver}" Foreground="{DynamicResource ColorHeaderButtonIsPressed}" Height="16" Width="16" Style="{DynamicResource HeaderButtonTemplate}">
7777
<Image Source="/View/SaveAs_16x.png" Height="16"/>
7878
</Button>-->
@@ -91,25 +91,25 @@
9191
</ToolBarTray>
9292
<!--BorderBrush - it's color on IsMouseOver, OpacityMask - it's color on IsPressed-->
9393
<TabControl Grid.Row="2" Background="{x:Null}" BorderBrush="{x:Null}" TabStripPlacement="Top" Padding="2,2,2,0" >
94-
<TabItem Header="Node editor" Style="{DynamicResource TabItemTemplate}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorTabItemText}" BorderBrush="{DynamicResource ColorTabItemIsMouseOver}" OpacityMask="{DynamicResource ColorHeaderButtonIsPressed}">
94+
<TabItem Header="Node editor" Style="{StaticResource TabItemTemplate}" Background="{StaticResource ColorWindowHeader}" Foreground="{StaticResource ColorTabItemText}" BorderBrush="{StaticResource ColorTabItemIsMouseOver}" OpacityMask="{StaticResource ColorHeaderButtonIsPressed}">
9595
<view:ViewNodesCanvas x:Name="NodesCanvas" />
9696
</TabItem>
9797
<!--<TabItem Header="Transitions table" Style="{DynamicResource TabItemTemplate}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorTabItemText}" BorderBrush="{DynamicResource ColorTabItemIsMouseOver}" OpacityMask="{DynamicResource ColorTabItemIsSelected}"/>-->
9898
</TabControl>
99-
<GridSplitter Grid.Row="3" x:Name="ErrorListSplitter" HorizontalAlignment="Stretch" Background="{DynamicResource ColorWindowHeader}" Height="3" ShowsPreview="False" IsEnabled="False"/>
100-
<Expander Style="{DynamicResource ExpanderTemplate}" x:Name="ErrorListExpander" Grid.Row="4" HorizontalContentAlignment="Stretch" ExpandDirection="Up" OpacityMask="#FFB34F4F" Margin="3,0,0,0" >
99+
<GridSplitter Grid.Row="3" x:Name="ErrorListSplitter" HorizontalAlignment="Stretch" Background="{StaticResource ColorWindowHeader}" Height="3" ShowsPreview="False" IsEnabled="False"/>
100+
<Expander Style="{StaticResource ExpanderTemplate}" x:Name="ErrorListExpander" Grid.Row="4" HorizontalContentAlignment="Stretch" ExpandDirection="Up" OpacityMask="#FFB34F4F" Margin="3,0,0,0" >
101101
<Expander.Header>
102102
<!--<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="White" >Error List</TextBlock>-->
103-
<Label Style="{DynamicResource LabelTemplate}" HorizontalAlignment="Left" VerticalAlignment="Top">Error List</Label>
103+
<Label Style="{StaticResource LabelTemplate}" HorizontalAlignment="Left" VerticalAlignment="Top">Error List</Label>
104104
</Expander.Header>
105105
<Expander.Content>
106-
<ListBox x:Name="MessageList" Template="{DynamicResource ListBoxTemplate}" Style="{DynamicResource ListBoxStyle}" Background="#2a2a2c" BorderBrush="{DynamicResource ColorMenuBorder}" Foreground="AliceBlue" ItemContainerStyle="{DynamicResource _ListBoxItemStyle}">
106+
<ListBox x:Name="MessageList" Template="{StaticResource ListBoxTemplate}" Background="#2a2a2c" BorderBrush="{StaticResource ColorMenuBorder}" Foreground="AliceBlue" ItemContainerStyle="{StaticResource ListBoxItemStyle}">
107107
<ListBox.InputBindings>
108108
<KeyBinding x:Name="BindingCopyError" Key="C" Modifiers="Control" />
109109
</ListBox.InputBindings>
110110
<ListBox.ContextMenu>
111-
<ContextMenu Template="{DynamicResource ContextMenuTemplate}" Background="#1b1b1c" OpacityMask="#3e3e40" Foreground="White" BorderBrush="#333337" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
112-
<MenuItem Header="Copy" x:Name="ItemCopyError" InputGestureText="Ctrl + C" Style="{DynamicResource ContextMenuItemStyle}" />
111+
<ContextMenu Template="{StaticResource ContextMenuTemplate}" Background="#1b1b1c" OpacityMask="#3e3e40" Foreground="White" BorderBrush="#333337" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
112+
<MenuItem Header="Copy" x:Name="ItemCopyError" InputGestureText="Ctrl + C" Style="{StaticResource ContextMenuItemStyle}" />
113113
</ContextMenu>
114114
</ListBox.ContextMenu>
115115
<ListBox.ItemTemplate>

‎SimpleStateMachineNodeEditor/View/ViewLeftConnector.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
xmlns:local="clr-namespace:SimpleStateMachineNodeEditor.View"
77
x:Name="LeftConnector" HorizontalAlignment="Stretch" VerticalAlignment="Top" AllowDrop="True" >
88

9-
<Grid x:Name="GridElement" Background="{DynamicResource ColorLeftConnectorBackground}">
9+
<Grid x:Name="GridElement" Background="{StaticResource ColorLeftConnectorBackground}">
1010
<Grid.ColumnDefinitions>
1111
<ColumnDefinition Width="Auto" />
1212
<ColumnDefinition />
1313
</Grid.ColumnDefinitions>
1414
<Grid.RowDefinitions>
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
17-
<TextBox Name="TextBoxElement" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,5,3" TextWrapping="NoWrap" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{DynamicResource ColorLeftConnectorText}" Style="{DynamicResource LeftConnectorTextBoxStyle}"/>
18-
<Ellipse Name="EllipseElement" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-7,0,0,0" Height="12" Width="12" AllowDrop="True" StrokeThickness="1" Style="{DynamicResource LeftConnectorEllipseStyle}" />
17+
<TextBox Name="TextBoxElement" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,5,3" TextWrapping="NoWrap" BorderThickness="0,0,0,0" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="{StaticResource ColorLeftConnectorText}" Style="{StaticResource LeftConnectorTextBoxStyle}"/>
18+
<Ellipse Name="EllipseElement" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-7,0,0,0" Height="12" Width="12" AllowDrop="True" StrokeThickness="1" Style="{StaticResource LeftConnectorEllipseStyle}" />
1919
</Grid>
2020

2121
</UserControl>

‎SimpleStateMachineNodeEditor/View/ViewNode.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:View="clr-namespace:SimpleStateMachineNodeEditor.View"
99
mc:Ignorable="d" Focusable="True" AllowDrop="True" Visibility="Visible">
1010

11-
<Border x:Name="BorderElement" CornerRadius="5,5,5,5" BorderThickness="1,1,1,1" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="80" Background="{DynamicResource ColorNodeBody}" >
11+
<Border x:Name="BorderElement" CornerRadius="5,5,5,5" BorderThickness="1,1,1,1" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="80" Background="{StaticResource ColorNodeBody}" >
1212
<StackPanel Margin="0,0,0,5">
1313
<NodeStyles:NodeHeader x:Name="NodeHeaderElement" />
1414
<!--Grid For Input and Output-->

‎SimpleStateMachineNodeEditor/View/ViewNodesCanvas.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686

8787
</Canvas>
8888
<UserControl.ContextMenu >
89-
<ContextMenu Template="{DynamicResource ContextMenuTemplate}" Background="#1b1b1c" OpacityMask="#3e3e40" Foreground="White" BorderBrush="#333337" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
90-
<MenuItem Header="Add" x:Name="ItemAddNode" InputGestureText="Ctrl + N" Style="{DynamicResource ContextMenuItemStyle}" />
91-
<MenuItem Header="Delete" x:Name="ItemDeleteNode" InputGestureText="Delete" Style="{DynamicResource ContextMenuItemStyle}"/>
89+
<ContextMenu Template="{StaticResource ContextMenuTemplate}" Background="#1b1b1c" OpacityMask="#3e3e40" Foreground="White" BorderBrush="#333337" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
90+
<MenuItem Header="Add" x:Name="ItemAddNode" InputGestureText="Ctrl + N" Style="{StaticResource ContextMenuItemStyle}" />
91+
<MenuItem Header="Delete" x:Name="ItemDeleteNode" InputGestureText="Delete" Style="{StaticResource ContextMenuItemStyle}"/>
9292
</ContextMenu>
9393
</UserControl.ContextMenu>
9494

0 commit comments

Comments
 (0)