Merge pull request #139 from clover-yan/patch/ui

把画笔粗细调节栏移到扳手菜单

Author: Raspberry-Monster

Ink Canvas/MainWindow.xaml

@@ -393,7 +393,7 @@
                         <GroupBox Header="画板">
                             <ui:SimpleStackPanel Spacing="12">
                                 <StackPanel Orientation="Horizontal">
-                                    <Slider x:Name="InkWidthSlider"
+                                    <Slider x:Name="InkWidthSlider" 
                                             HorizontalAlignment="Left"
                                             Minimum="1" Maximum="20"
                                             Width="330" FontFamily="Microsoft YaHei UI" 
@@ -1196,10 +1196,25 @@
                                 <ui:SymbolIcon Margin="0,0,0,0" Symbol="Camera" Foreground="{DynamicResource FloatBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconScreenshot_MouseUp"/>
                                 <Grid Height="24" Width="20">
                                     <ui:SymbolIcon Symbol="Repair" Foreground="{DynamicResource FloatBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp"/>
-                                    <Border Name="BorderTools" Margin="37,-157,-140,-6" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
+                                    <Border Name="BorderTools" Margin="37,-195,-140,-6" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
                                         <ui:SimpleStackPanel>
                                             <Label Content="快捷设置" FontSize="14" Foreground="{DynamicResource FloatBarForeground}"
                                                    HorizontalAlignment="Left" Margin="8,8"/>
+                                            <Viewbox Margin="12,0,0,0" Height="38" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                                <ui:SimpleStackPanel>
+                                                    <Label Margin="0,0,0,-2" Content="画笔粗细" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Slider HorizontalAlignment="Left"
+                                                                Minimum="1" Maximum="20"
+                                                                Width="100"
+                                                                IsSnapToTickEnabled="True" Value="{Binding ElementName=InkWidthSlider, Path=Value, Mode=TwoWay}"
+                                                                TickFrequency="1" TickPlacement="Both"/>
+                                                        <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
+                                                                   VerticalAlignment="Bottom" Margin="10,0,0,8"
+                                                                   Width="15" FontSize="13"/>
+                                                    </StackPanel>
+                                                </ui:SimpleStackPanel>
+                                            </Viewbox>
                                             <Viewbox Margin="12,0,0,0" Height="32" Width="50" HorizontalAlignment="Left" VerticalAlignment="Top">
                                                 <ui:SimpleStackPanel>
                                                     <Label Margin="0,0,0,-2" Content="墨迹识别" Foreground="{DynamicResource FloatBarForeground}" FontSize="13" VerticalAlignment="Center"/>