|
@@ -24,12 +24,6 @@
|
|
|
<Window.Resources>
|
|
|
<ResourceDictionary>
|
|
|
<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
|
|
|
- <converters:BoolToIntConverter x:Key="BoolToIntConverter" />
|
|
|
- <converters:NotNullToBoolConverter x:Key="NotNullToBoolConverter" />
|
|
|
- <converters:LayersToStructuredLayersConverter x:Key="LayersToStructuredLayersConverter"/>
|
|
|
- <converters:DoubleToIntConverter x:Key="DoubleToIntConverter"/>
|
|
|
- <converters:IsSpecifiedTypeConverter SpecifiedType="{x:Type tools:ZoomTool}" x:Key="IsZoomToolConverter"/>
|
|
|
- <converters:IsSpecifiedTypeConverter SpecifiedType="{x:Type tools:MoveViewportTool}" x:Key="IsMoveViewportToolConverter"/>
|
|
|
<ResourceDictionary.MergedDictionaries>
|
|
|
<ResourceDictionary Source="pack://application:,,,/ColorPicker;component/Styles/DefaultColorPickerStyle.xaml" />
|
|
|
</ResourceDictionary.MergedDictionaries>
|
|
@@ -269,8 +263,8 @@
|
|
|
MouseXOnCanvas="{Binding MouseXOnCanvas, Mode=TwoWay}"
|
|
|
MouseYOnCanvas="{Binding MouseYOnCanvas, Mode=TwoWay}"
|
|
|
UseTouchGestures="{Binding XamlAccesibleViewModel.StylusSubViewModel.UseTouchGestures}"
|
|
|
- IsUsingZoomTool="{Binding XamlAccesibleViewModel.BitmapManager.SelectedTool, Converter={StaticResource IsZoomToolConverter}}"
|
|
|
- IsUsingMoveViewportTool="{Binding XamlAccesibleViewModel.BitmapManager.SelectedTool, Converter={StaticResource IsMoveViewportToolConverter}}"
|
|
|
+ IsUsingZoomTool="{Binding XamlAccesibleViewModel.BitmapManager.SelectedTool, Converter={converters:IsSpecifiedTypeConverter SpecifiedType={x:Type tools:ZoomTool}}}"
|
|
|
+ IsUsingMoveViewportTool="{Binding XamlAccesibleViewModel.BitmapManager.SelectedTool, Converter={converters:IsSpecifiedTypeConverter SpecifiedType={x:Type tools:MoveViewportTool}}}"
|
|
|
Stylus.IsTapFeedbackEnabled="False" Stylus.IsTouchFeedbackEnabled="False">
|
|
|
<i:Interaction.Triggers>
|
|
|
<i:EventTrigger EventName="PreviewMouseDown">
|
|
@@ -334,9 +328,9 @@
|
|
|
<layerUserControls:LayersManager
|
|
|
LayerCommandsViewModel="{Binding LayersSubViewModel}"
|
|
|
OpacityInputEnabled="{Binding BitmapManager.ActiveDocument,
|
|
|
- Converter={StaticResource NotNullToBoolConverter}}">
|
|
|
+ Converter={converters:NotNullToBoolConverter}}">
|
|
|
<layerUserControls:LayersManager.LayerTreeRoot>
|
|
|
- <MultiBinding Converter="{StaticResource LayersToStructuredLayersConverter}">
|
|
|
+ <MultiBinding Converter="{converters:LayersToStructuredLayersConverter}">
|
|
|
<Binding Path="BitmapManager.ActiveDocument.Layers" />
|
|
|
<Binding Path="BitmapManager.ActiveDocument.LayerStructure"/>
|
|
|
</MultiBinding>
|
|
@@ -371,11 +365,11 @@
|
|
|
<ItemsControl ItemsSource="{Binding ToolsSubViewModel.ToolSet}">
|
|
|
<ItemsControl.ItemTemplate>
|
|
|
<DataTemplate>
|
|
|
- <Button BorderBrush="White"
|
|
|
- BorderThickness="{Binding IsActive, Converter={StaticResource BoolToIntConverter}}"
|
|
|
+ <Button BorderBrush="White"
|
|
|
+ BorderThickness="{Binding IsActive, Converter={converters:BoolToIntConverter}}"
|
|
|
Style="{StaticResource ToolButtonStyle}"
|
|
|
Command="{Binding Path=DataContext.ToolsSubViewModel.SelectToolCommand,
|
|
|
- RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
|
|
|
+ RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
|
|
|
CommandParameter="{Binding}" ToolTip="{Binding Tooltip}">
|
|
|
<Button.Background>
|
|
|
<ImageBrush ImageSource="{Binding ImagePath}" Stretch="Uniform" />
|
|
@@ -401,9 +395,9 @@
|
|
|
<TextBlock Text="{Binding ActionDisplay}" Foreground="White" FontSize="15" Margin="10,0,0,0" VerticalAlignment="Center"/>
|
|
|
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
|
|
|
<TextBlock Text="X:" Foreground="White" FontSize="16"/>
|
|
|
- <TextBlock Margin="4,0,10,0" Text="{Binding BitmapManager.ActiveDocument.MouseXOnCanvas, Converter={StaticResource DoubleToIntConverter}}" Foreground="White" FontSize="16"/>
|
|
|
+ <TextBlock Margin="4,0,10,0" Text="{Binding BitmapManager.ActiveDocument.MouseXOnCanvas, Converter={converters:DoubleToIntConverter}}" Foreground="White" FontSize="16"/>
|
|
|
<TextBlock Text="Y:" Foreground="White" FontSize="16"/>
|
|
|
- <TextBlock Margin="4,0,10,0" Text="{Binding BitmapManager.ActiveDocument.MouseYOnCanvas, Converter={StaticResource DoubleToIntConverter}}" Foreground="White" FontSize="16"/>
|
|
|
+ <TextBlock Margin="4,0,10,0" Text="{Binding BitmapManager.ActiveDocument.MouseYOnCanvas, Converter={converters:DoubleToIntConverter}}" Foreground="White" FontSize="16"/>
|
|
|
</StackPanel>
|
|
|
</DockPanel>
|
|
|
<StackPanel Margin="10,0,0,0" VerticalAlignment="Center" Grid.Row="3"
|