diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-10 09:22:37 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-10 09:22:37 +0300 |
| commit | 1b4e8a948a1d1c07bbda5b75ba1dd54f5f77446a (patch) | |
| tree | ae442d3e3bf236d87703d4796ae6a20787c8d8b0 /Software/Visual_Studio/MachineStudio/Modules | |
| parent | 4092207080cf7c7693b7c4eb898720e4da78f38f (diff) | |
| parent | b7bd2edc8c009ded74ea1680a2b8de1a80015d35 (diff) | |
| download | Tango-1b4e8a948a1d1c07bbda5b75ba1dd54f5f77446a.tar.gz Tango-1b4e8a948a1d1c07bbda5b75ba1dd54f5f77446a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml index 6856cf4a2..ded1acb2d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml @@ -143,7 +143,7 @@ <TextBlock DockPanel.Dock="Top" FontSize="16">CATALOG GROUPS</TextBlock> <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch"> - <DataGrid x:Name="gridGroups" Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding ActiveCatalog.ColorCatalogsGroups}" SelectedItem="{Binding SelectedGroup}" CanUserDeleteRows="False" PreviewKeyDown="OnGroupsGrid_PreviewKeyDown"> + <DataGrid x:Name="gridGroups" Style="{StaticResource EditableGrid}" CellStyle="{StaticResource EditableCell}" ItemsSource="{Binding ActiveCatalog.ColorCatalogsGroups,Converter={StaticResource ObservableCollectionToViewSourceConverter},ConverterParameter='GroupIndex'}" SelectedItem="{Binding SelectedGroup}" CanUserDeleteRows="False" PreviewKeyDown="OnGroupsGrid_PreviewKeyDown"> <DataGrid.Columns> <DataGridTemplateColumn Header="" Width="Auto"> <DataGridTemplateColumn.CellTemplate> |