|
|
@@ -275,7 +275,7 @@
|
|
|
<Grid.ContextMenu>
|
|
|
<ContextMenu>
|
|
|
<MenuItem Header="Remove" Foreground="White"
|
|
|
- Command="{Binding ColorsSubViewModel.RemoveSwatchCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding ColorsSubViewModel.RemoveSwatchCommand}"
|
|
|
CommandParameter="{Binding}" />
|
|
|
</ContextMenu>
|
|
|
</Grid.ContextMenu>
|
|
|
@@ -318,7 +318,7 @@
|
|
|
</ItemsControl.ItemsPanel>
|
|
|
<ItemsControl.ItemTemplate>
|
|
|
<DataTemplate>
|
|
|
- <vws:LayerItem LayerIndex="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
+ <vws:LayerItem Tag="{Binding DataContext, ElementName=mainWindow}" LayerIndex="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" SetActiveLayerCommand="{Binding Path=DataContext.LayersSubViewModel.SetActiveLayerCommand, ElementName=mainWindow}"
|
|
|
LayerName="{Binding Name, Mode=TwoWay}" IsActive="{Binding IsActive, Mode=TwoWay}"
|
|
|
IsRenaming="{Binding IsRenaming, Mode=TwoWay}"
|
|
|
@@ -328,27 +328,33 @@
|
|
|
<vws:LayerItem.ContextMenu>
|
|
|
<ContextMenu>
|
|
|
<MenuItem Header="Delete"
|
|
|
- Command="{Binding LayersSubViewModel.DeleteLayerCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding PlacementTarget.Tag.LayersSubViewModel.DeleteLayerCommand,
|
|
|
+ RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
|
|
CommandParameter="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" />
|
|
|
<MenuItem Header="Rename"
|
|
|
- Command="{Binding LayersSubViewModel.RenameLayerCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding PlacementTarget.Tag.LayersSubViewModel.RenameLayerCommand,
|
|
|
+ RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
|
|
CommandParameter="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" />
|
|
|
<MenuItem Header="Move to front"
|
|
|
- Command="{Binding LayersSubViewModel.MoveToFrontCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding PlacementTarget.Tag.LayersSubViewModel.MoveToFrontCommand,
|
|
|
+ RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
|
|
CommandParameter="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" />
|
|
|
<MenuItem Header="Move to back"
|
|
|
- Command="{Binding LayersSubViewModel.MoveToBackCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding PlacementTarget.Tag.LayersSubViewModel.MoveToBackCommand,
|
|
|
+ RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
|
|
CommandParameter="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" />
|
|
|
<MenuItem Header="Merge with above"
|
|
|
- Command="{Binding LayersSubViewModel.MergeWithAboveCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding PlacementTarget.Tag.LayersSubViewModel.MergeWithAboveCommand,
|
|
|
+ RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
|
|
CommandParameter="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" />
|
|
|
<MenuItem Header="Merge with below"
|
|
|
- Command="{Binding LayersSubViewModel.MergeWithBelowCommand, Source={StaticResource ViewModelMain}}"
|
|
|
+ Command="{Binding PlacementTarget.Tag.LayersSubViewModel.MergeWithBelowCommand,
|
|
|
+ RelativeSource={RelativeSource AncestorType=ContextMenu}}"
|
|
|
CommandParameter="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},
|
|
|
Path=(ItemsControl.AlternationIndex)}" />
|
|
|
</ContextMenu>
|
flabbet