|
@@ -116,127 +116,97 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
|
|
|
- <ToggleButton
|
|
|
- Name="SharpRectBtn"
|
|
|
- Width="40.5"
|
|
|
- Background="Transparent"
|
|
|
- BorderThickness="0"
|
|
|
- Click="SharpsBtn_Click"
|
|
|
- Command="{Binding SharpsTypeCommand}"
|
|
|
- CommandParameter="{Binding ElementName=SharpRectBtn, Path=Tag}"
|
|
|
- Tag="Rect">
|
|
|
- <Rectangle
|
|
|
+ <RadioButton x:Name="SharpRectBtn" Tag="Rect" GroupName="Shape"
|
|
|
+ Width="32" Height="32" Margin="0,0"
|
|
|
+ VerticalContentAlignment="Center" Background="Transparent"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}">
|
|
|
+ <RadioButton.Content>
|
|
|
+ <Rectangle
|
|
|
Width="16"
|
|
|
Height="16"
|
|
|
HorizontalAlignment="Center"
|
|
|
VerticalAlignment="Center"
|
|
|
Stroke="#273C62" />
|
|
|
- </ToggleButton>
|
|
|
+ </RadioButton.Content>
|
|
|
+ <i:Interaction.Triggers>
|
|
|
+ <i:EventTrigger EventName="Checked">
|
|
|
+ <i:InvokeCommandAction Command="{Binding SharpsTypeCommand}" CommandParameter="{Binding ElementName=SharpRectBtn, Path=Tag}"/>
|
|
|
+ </i:EventTrigger>
|
|
|
+ </i:Interaction.Triggers>
|
|
|
+ </RadioButton>
|
|
|
|
|
|
- <Line
|
|
|
- Name="line1"
|
|
|
- Grid.Column="1"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- VerticalAlignment="Center"
|
|
|
- Stroke="#33000000"
|
|
|
- StrokeThickness="1"
|
|
|
- X1="0"
|
|
|
- X2="0"
|
|
|
- Y1="0"
|
|
|
- Y2="16" />
|
|
|
|
|
|
- <ToggleButton
|
|
|
- Name="SharpCircleBtn"
|
|
|
- Grid.Column="1"
|
|
|
- Width="40.5"
|
|
|
- Margin="0,0,0,0"
|
|
|
- Background="Transparent"
|
|
|
- BorderThickness="0"
|
|
|
- Click="SharpsBtn_Click"
|
|
|
- Command="{Binding SharpsTypeCommand}"
|
|
|
- CommandParameter="{Binding ElementName=SharpCircleBtn, Path=Tag}"
|
|
|
- Tag="Circle">
|
|
|
- <Ellipse
|
|
|
+
|
|
|
+ <RadioButton x:Name="SharpCircleBtn" Tag="Circle" GroupName="Shape" Grid.Column="1"
|
|
|
+ Width="32" Height="32" Margin="0,0"
|
|
|
+ VerticalContentAlignment="Center" Background="Transparent"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}">
|
|
|
+ <RadioButton.Content>
|
|
|
+ <Ellipse
|
|
|
Width="16"
|
|
|
Height="16"
|
|
|
HorizontalAlignment="Center"
|
|
|
VerticalAlignment="Center"
|
|
|
Stroke="#273C62" />
|
|
|
- </ToggleButton>
|
|
|
+ </RadioButton.Content>
|
|
|
+ <i:Interaction.Triggers>
|
|
|
+ <i:EventTrigger EventName="Checked">
|
|
|
+ <i:InvokeCommandAction Command="{Binding SharpsTypeCommand}" CommandParameter="{Binding ElementName=SharpCircleBtn, Path=Tag}"/>
|
|
|
+ </i:EventTrigger>
|
|
|
+ </i:Interaction.Triggers>
|
|
|
+ </RadioButton>
|
|
|
|
|
|
|
|
|
- <Line
|
|
|
- Name="line2"
|
|
|
- Grid.Column="2"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- VerticalAlignment="Center"
|
|
|
- Stroke="#33000000"
|
|
|
- StrokeThickness="1"
|
|
|
- Style="{StaticResource line2Style}"
|
|
|
- X1="0"
|
|
|
- X2="0"
|
|
|
- Y1="0"
|
|
|
- Y2="16" />
|
|
|
- <ToggleButton
|
|
|
- Name="SharpArrowBtn"
|
|
|
- Grid.Column="2"
|
|
|
- Width="40.5"
|
|
|
- Background="Transparent"
|
|
|
- BorderThickness="0"
|
|
|
- Click="SharpsBtn_Click"
|
|
|
- Command="{Binding SharpsTypeCommand}"
|
|
|
- CommandParameter="{Binding ElementName=SharpArrowBtn, Path=Tag}"
|
|
|
- Tag="Arrow">
|
|
|
- <Path
|
|
|
+
|
|
|
+
|
|
|
+ <RadioButton x:Name="SharpArrowBtn" Tag="Arrow" GroupName="Shape" Grid.Column="2"
|
|
|
+ Width="32" Height="32" Margin="0,0"
|
|
|
+ VerticalContentAlignment="Center" Background="Transparent"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}">
|
|
|
+ <RadioButton.Content>
|
|
|
+ <Path
|
|
|
Width="16"
|
|
|
Height="16"
|
|
|
HorizontalAlignment="Center"
|
|
|
VerticalAlignment="Center"
|
|
|
Fill="#273C62">
|
|
|
- <Path.Data>
|
|
|
- M13.4,2.6 L13.4,8 L12.2,8 L12.1997359,4.648 L2.02426407,14.8242641 L1.17573593,13.9757359 L11.3517359,3.799 L8,3.8 L8,2.6 L13.4,2.6 Z
|
|
|
- </Path.Data>
|
|
|
- </Path>
|
|
|
- </ToggleButton>
|
|
|
+ <Path.Data>
|
|
|
+ M13.4,2.6 L13.4,8 L12.2,8 L12.1997359,4.648 L2.02426407,14.8242641 L1.17573593,13.9757359 L11.3517359,3.799 L8,3.8 L8,2.6 L13.4,2.6 Z
|
|
|
+ </Path.Data>
|
|
|
+ </Path>
|
|
|
+ </RadioButton.Content>
|
|
|
+ <i:Interaction.Triggers>
|
|
|
+ <i:EventTrigger EventName="Checked">
|
|
|
+ <i:InvokeCommandAction Command="{Binding SharpsTypeCommand}" CommandParameter="{Binding ElementName=SharpArrowBtn, Path=Tag}"/>
|
|
|
+ </i:EventTrigger>
|
|
|
+ </i:Interaction.Triggers>
|
|
|
+ </RadioButton>
|
|
|
|
|
|
- <Line
|
|
|
- x:Name="line3"
|
|
|
- Grid.Column="3"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- VerticalAlignment="Center"
|
|
|
- Stroke="#33000000"
|
|
|
- StrokeThickness="1"
|
|
|
- Style="{StaticResource line3Style}"
|
|
|
- X1="0"
|
|
|
- X2="0"
|
|
|
- Y1="0"
|
|
|
- Y2="16" />
|
|
|
- <ToggleButton
|
|
|
- Name="SharpLineBtn"
|
|
|
- Grid.Column="3"
|
|
|
- Width="40.5"
|
|
|
- Background="Transparent"
|
|
|
- BorderThickness="0"
|
|
|
- Click="SharpsBtn_Click"
|
|
|
- Command="{Binding SharpsTypeCommand}"
|
|
|
- CommandParameter="{Binding ElementName=SharpLineBtn, Path=Tag}"
|
|
|
- Tag="Line">
|
|
|
- <Polygon
|
|
|
+ <RadioButton x:Name="SharpLineBtn" Tag="Line" GroupName="Shape" Grid.Column="3"
|
|
|
+ Width="32" Height="32" Margin="0,0"
|
|
|
+ VerticalContentAlignment="Center" Background="Transparent"
|
|
|
+ Style="{DynamicResource GreyBgRadioBtnStyle}">
|
|
|
+ <RadioButton.Content>
|
|
|
+ <Polygon
|
|
|
Width="16"
|
|
|
Height="16"
|
|
|
HorizontalAlignment="Center"
|
|
|
VerticalAlignment="Center"
|
|
|
Fill="#273C62">
|
|
|
- <Polygon.Points>
|
|
|
- 13.1757359 1.97573593 14.0242641 2.82426407 2.82426407 14.0242641 1.97573593 13.1757359
|
|
|
- </Polygon.Points>
|
|
|
- </Polygon>
|
|
|
- </ToggleButton>
|
|
|
-
|
|
|
+ <Polygon.Points>
|
|
|
+ 13.1757359 1.97573593 14.0242641 2.82426407 2.82426407 14.0242641 1.97573593 13.1757359
|
|
|
+ </Polygon.Points>
|
|
|
+ </Polygon>
|
|
|
+ </RadioButton.Content>
|
|
|
+ <i:Interaction.Triggers>
|
|
|
+ <i:EventTrigger EventName="Checked">
|
|
|
+ <i:InvokeCommandAction Command="{Binding SharpsTypeCommand}" CommandParameter="{Binding ElementName=SharpLineBtn, Path=Tag}"/>
|
|
|
+ </i:EventTrigger>
|
|
|
+ </i:Interaction.Triggers>
|
|
|
+ </RadioButton>
|
|
|
</Grid>
|
|
|
</Border>
|
|
|
|
|
|
-
|
|
|
<Grid x:Name="GridFill" Margin="0,18,0,0">
|
|
|
<Grid.RowDefinitions>
|
|
|
<RowDefinition Height="auto" />
|
|
@@ -293,95 +263,6 @@
|
|
|
</i:Interaction.Triggers>
|
|
|
</CompositeControl:SlidComboControl>
|
|
|
|
|
|
-
|
|
|
- <!--<Grid>
|
|
|
- <Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition Width="*" />
|
|
|
- <ColumnDefinition Width="auto" />
|
|
|
- </Grid.ColumnDefinitions>
|
|
|
- <Slider
|
|
|
- Name="BorderSlider"
|
|
|
- Margin="12,0,4,0"
|
|
|
- VerticalAlignment="Center"
|
|
|
- IsMoveToPointEnabled="True"
|
|
|
- IsSelectionRangeEnabled="True"
|
|
|
- IsSnapToTickEnabled="True"
|
|
|
- Maximum="12"
|
|
|
- Minimum="1"
|
|
|
- Style="{StaticResource RoundThumbSlider}"
|
|
|
- TickFrequency="1"
|
|
|
- Value="{Binding LineWidth}">
|
|
|
- <Slider.Resources>
|
|
|
- <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="#477EDE" />
|
|
|
- <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkDarkBrushKey}" Color="#E2E3E6" />
|
|
|
- </Slider.Resources>
|
|
|
- </Slider>
|
|
|
-
|
|
|
- <Border
|
|
|
- Grid.Column="1"
|
|
|
- Width="80"
|
|
|
- Height="32"
|
|
|
- Margin="0,0,12,0"
|
|
|
- BorderBrush="#E2E3E6"
|
|
|
- BorderThickness="0">
|
|
|
- <Grid>
|
|
|
- <ComboBox
|
|
|
- Name="BorderDropBox"
|
|
|
- Padding="10,10,0,0"
|
|
|
- Background="Transparent"
|
|
|
- BorderBrush="#FFE2E3E6"
|
|
|
- BorderThickness="1">
|
|
|
- <ComboBox.ItemContainerStyle>
|
|
|
- <Style TargetType="{x:Type ComboBoxItem}">
|
|
|
- <Setter Property="Padding" Value="10,0,0,0" />
|
|
|
- </Style>
|
|
|
- </ComboBox.ItemContainerStyle>
|
|
|
- <ComboBoxItem
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Content="1"
|
|
|
- Template="{StaticResource comboxitem}" />
|
|
|
- <ComboBoxItem
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Content="3"
|
|
|
- Template="{StaticResource comboxitem}" />
|
|
|
- <ComboBoxItem
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Content="6"
|
|
|
- Template="{StaticResource comboxitem}" />
|
|
|
- <ComboBoxItem
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Content="9"
|
|
|
- Template="{StaticResource comboxitem}" />
|
|
|
- <ComboBoxItem
|
|
|
- Height="32"
|
|
|
- VerticalContentAlignment="Center"
|
|
|
- Content="12"
|
|
|
- Template="{StaticResource comboxitem}" />
|
|
|
- <i:Interaction.Triggers>
|
|
|
- <i:EventTrigger EventName="SelectionChanged">
|
|
|
- <i:InvokeCommandAction Command="{Binding ThicknessChangedCommand}" CommandParameter="{Binding ElementName=BorderDropBox, Path=SelectedItem}" />
|
|
|
- </i:EventTrigger>
|
|
|
- </i:Interaction.Triggers>
|
|
|
- </ComboBox>
|
|
|
- <TextBox
|
|
|
- Height="20"
|
|
|
- Margin="10,0,35,0"
|
|
|
- VerticalAlignment="Center"
|
|
|
- Background="White"
|
|
|
- BorderThickness="0"
|
|
|
- FontFamily="Segoe UI"
|
|
|
- FontSize="14"
|
|
|
- IsReadOnly="True"
|
|
|
- Text="{Binding ElementName=BorderSlider, Path=Value}"
|
|
|
- TextAlignment="Left" />
|
|
|
- </Grid>
|
|
|
- </Border>
|
|
|
- </Grid>-->
|
|
|
-
|
|
|
<StackPanel x:Name="PnlLineStyle" Orientation="Horizontal" Margin="0,20,0,0">
|
|
|
|
|
|
<RadioButton x:Name="BtnSolid" Tag="Solid" GroupName="LineMode"
|