Skip to content

Commit c78c927

Browse files
RomanSoloweowRomanSoloweow
committed
some fix
1 parent ec3a97b commit c78c927

File tree

4 files changed

+29
-43
lines changed

4 files changed

+29
-43
lines changed

‎SimpleStateMachineNodeEditor/Styles/TableOfTransitions/StyleListBoxTransitionsItem.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<ContentPresenter />
1111
</Border>
1212
<ControlTemplate.Triggers>
13-
<!--<Trigger Property="ItemsControl.AlternationIndex" Value="0">
13+
<Trigger Property="ItemsControl.AlternationIndex" Value="0">
1414
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ColorNodesCanvasBackground}"></Setter>
1515
</Trigger>
1616
<Trigger Property="ItemsControl.AlternationIndex" Value="1">
1717
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ColorMessagesBackground}"></Setter>
18-
</Trigger>-->
18+
</Trigger>
1919
<Trigger Property="IsSelected" Value="true">
2020
<Setter TargetName="Border" Property="Background" Value="{DynamicResource ColorElementMouseOver}"/>
2121
<Setter Property="Foreground" Value="{DynamicResource ColorMessagesForegroundSelected}"/>

‎SimpleStateMachineNodeEditor/View/MainWindow.xaml‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -180,39 +180,12 @@
180180
<!--<TabItem Header="Transitions table" ToolTip="" Style="{DynamicResource StyleTabItem}" Foreground="{DynamicResource ColorForeground}"/>-->
181181
<TabItem Header="Transitions table" Style="{DynamicResource StyleTabItem}" Background="{DynamicResource ColorWindowHeader}" Foreground="{DynamicResource ColorWindowHeaderTabItemForeground}" BorderBrush="{DynamicResource ColorElementMouseOver}" OpacityMask="{DynamicResource ColorElementMouseOver}">
182182

183-
<ListBox x:Name="TableOfTransitions" Template="{DynamicResource TemplateListBox}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorMessagesBorder}" Foreground="{DynamicResource ColorMessagesForeground}" ItemContainerStyle="{DynamicResource StyleListBoxTransitionsItem}" AlternationCount="2"
183+
<ListBox x:Name="TableOfTransitions" Template="{DynamicResource TemplateListBox}" Background="{DynamicResource ColorWindowHeader}" BorderBrush="{DynamicResource ColorMessagesBorder}" Foreground="{DynamicResource ColorMessagesForeground}" ItemContainerStyle="{DynamicResource StyleListBoxTransitionsItem}" AlternationCount="2" Grid.IsSharedSizeScope="True"
184184
VirtualizingStackPanel.IsVirtualizing="True"
185185
VirtualizingStackPanel.VirtualizationMode="Recycling"
186186
VirtualizingStackPanel.CacheLength="1"
187187
VirtualizingStackPanel.CacheLengthUnit="Page"
188188
VirtualizingStackPanel.ScrollUnit="Pixel">
189-
<ListBox.Resources>
190-
<ControlTemplate x:Key="GroupItemTemplate" TargetType="{x:Type GroupItem}">
191-
<DockPanel>
192-
<Separator DockPanel.Dock="Left" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
193-
<StackPanel>
194-
<ContentPresenter />
195-
<!-- This will be automatically wired -->
196-
<ItemsPresenter Margin="5,0,0,0" />
197-
<!-- So will this -->
198-
</StackPanel>
199-
</DockPanel>
200-
</ControlTemplate>
201-
</ListBox.Resources>
202-
<ListBox.GroupStyle>
203-
<GroupStyle>
204-
<GroupStyle.HeaderTemplate>
205-
<DataTemplate>
206-
<TextBlock Text="{Binding Path=Name}" FontWeight="Bold" />
207-
</DataTemplate>
208-
</GroupStyle.HeaderTemplate>
209-
<GroupStyle.ContainerStyle>
210-
<Style TargetType="{x:Type GroupItem}">
211-
<Setter Property="Template" Value="{StaticResource GroupItemTemplate}" />
212-
</Style>
213-
</GroupStyle.ContainerStyle>
214-
</GroupStyle>
215-
</ListBox.GroupStyle>
216189
<ListBox.ItemTemplate>
217190
<DataTemplate>
218191
<view:ViewTableOfTransitionsItem ViewModel="{Binding}" />
@@ -283,6 +256,8 @@
283256
</Grid>
284257

285258
<Window.InputBindings>
259+
<KeyBinding x:Name="BindingUndo" Key="Z" Modifiers="Control" />
260+
<KeyBinding x:Name="BindingRedo" Key="Y" Modifiers="Control" />
286261
<KeyBinding x:Name="BindingSave" Gesture="Ctrl+S"/>
287262
<KeyBinding x:Name="BindingSaveAs" Gesture="Ctrl+Shift+S"/>
288263
<KeyBinding x:Name="BindingOpen" Gesture="Ctrl+Shift+O" />

‎SimpleStateMachineNodeEditor/View/ViewTableOfTransitionsItem.xaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
xmlns:styles="clr-namespace:SimpleStateMachineNodeEditor.Styles"
88
mc:Ignorable="d"
99
d:DesignHeight="450" d:DesignWidth="800">
10-
<Border BorderThickness="1" BorderBrush="Red">
11-
<Grid HorizontalAlignment="Stretch" x:Name="GridElement" >
10+
<Grid x:Name="GridElement" HorizontalAlignment="Stretch" >
1211
<Grid.ColumnDefinitions>
13-
<ColumnDefinition SharedSizeGroup="StateFrom"/>
14-
<!--<ColumnDefinition/>-->
15-
<ColumnDefinition SharedSizeGroup="TransitionName"/>
16-
<!--<ColumnDefinition/>-->
17-
<ColumnDefinition SharedSizeGroup="StateTo"/>
12+
<ColumnDefinition x:Name="ColumnStateFrom" SharedSizeGroup="StateFrom"/>
13+
<ColumnDefinition Width="*"/>
14+
<ColumnDefinition x:Name="TransitionName" SharedSizeGroup="TransitionName"/>
15+
<ColumnDefinition Width="*"/>
16+
<ColumnDefinition x:Name="StateTo" SharedSizeGroup="StateTo"/>
17+
<ColumnDefinition Width="*"/>
1818
</Grid.ColumnDefinitions>
19-
<styles:MyTextBox Grid.Column="0" x:Name="TextBoxElementStateFrom" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" HorizontalAlignment="Left" VerticalAlignment="Center" Padding="3" />
20-
<!--<Separator Grid.Column="1" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />-->
21-
<styles:MyTextBox Grid.Column="1" x:Name="TextBoxElementTransitionName" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Padding="3" />
22-
<!--<Separator Grid.Column="3" Style="{DynamicResource TemplateSeparator}" Height="Auto" BorderThickness="0,0,1,0" />-->
23-
<styles:MyTextBox Grid.Column="2" x:Name="TextBoxElementStateTo" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" TextWrapping="NoWrap" HorizontalAlignment="Left" VerticalAlignment="Center" Padding="3" />
19+
<Grid.RowDefinitions>
20+
<RowDefinition />
21+
</Grid.RowDefinitions>
22+
<styles:MyTextBox Grid.Column="0" Text="Test1" Grid.Row="0" Background="Red" x:Name="TextBoxElementStateFrom" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" TextWrapping="NoWrap" Padding="3" />
23+
<styles:MyTextBox Grid.Column="2" Text="Test2" Grid.Row="0" Background="Green" x:Name="TextBoxElementTransitionName" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" TextWrapping="NoWrap" Padding="3" />
24+
<styles:MyTextBox Grid.Column="4" Text="Test3" Grid.Row="0" Background="Blue" x:Name="TextBoxElementStateTo" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}}}" TextWrapping="NoWrap" Padding="3" />
2425
</Grid>
25-
</Border>
2626
</UserControl>
2727

2828

‎SimpleStateMachineNodeEditor/View/ViewTableOfTransitionsItem.xaml.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,20 @@ private void SetupBinding()
5252
this.OneWayBind(this.ViewModel, x => x.Node.Name, x => x.TextBoxElementStateTo.Text).DisposeWith(disposable);
5353
else
5454
this.OneWayBind(this.ViewModel, x => x.Connect.ToConnector.Node.Name, x => x.TextBoxElementStateTo.Text).DisposeWith(disposable);
55+
//this.WhenAnyValue(x=>x.GridElement.ActualWidth).Subscribe(value=>UpdateWidth(value)).DisposeWith(disposable);
5556
});
5657

5758
}
59+
private void UpdateWidth(double value)
60+
{
61+
//value *= 0.33;
62+
//if(TextBoxElementStateFrom.ActualWidth-10<value)
63+
// TextBoxElementStateFrom.Width = value;
64+
//if (TextBoxElementStateTo.ActualWidth - 10 < value)
65+
// TextBoxElementStateTo.Width = value;
66+
//if (TextBoxElementTransitionName.ActualWidth - 10 < value)
67+
// TextBoxElementTransitionName.Width = value;
68+
}
5869
#endregion SetupBinding
5970

6071
#region SetupEvents

0 commit comments

Comments
 (0)