Merge remote-tracking branch 'origin/zxy' into zyy

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -41,7 +41,7 @@ namespace XHWK.WKTool
             win.Topmost = true;
             win.Show();
             //显示在右下角
-            double xpos = this.Left + this.Width - win.Width + 180;
+            double xpos = this.Left + this.Width - win.Width-10;
             double ypos = this.Top + this.Height - win.Height - 60;
 
 

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="ScreenRecordingToolbarWindow" Height="450" Width="800" AllowsTransparency="True" 
+        Title="ScreenRecordingToolbarWindow" Height="450" Width="300" AllowsTransparency="True" 
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
     WindowStyle="None">
@@ -18,47 +18,58 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
-            <Image Grid.Row="0"  Source="./Images/Toobar22.png" HorizontalAlignment="Right"/>
-            <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,5,10,0">
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar5.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar12.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar9.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar16.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar3.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar23.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar1.png"/>
-                </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
-                    <Image Source="./Images/Toobar18.png"/>
-                </Button>
-            </StackPanel>
-            <!--字体粗细-->
-            <Image Grid.Row="0"  Source="./Images/Toobar20.png" HorizontalAlignment="Right" Margin="0,200,62,0" Visibility="Visible"/>
-            <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,200,62,0" Visibility="Visible">
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="3" Width="20" Margin="0,0,0,0"/>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="5" Width="20" Margin="0,10,0,0"/>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="10" Width="20" Margin="0,10,0,0"/>
-            </StackPanel>
+            <!--画笔工具栏-->
+            <Grid Grid.Row="0" x:Name="gridToolbar" Visibility="Visible">
+                <Image Grid.Row="0"  Source="./Images/Toobar22.png" HorizontalAlignment="Right"/>
+                <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,5,10,0">
+                    <Button x:Name="btnToolbarDown" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnToolbarDown_Click">
+                        <Image Source="./Images/Toobar5.png"/>
+                    </Button>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                        <Image Source="./Images/Toobar12.png"/>
+                    </Button>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                        <Image Source="./Images/Toobar9.png"/>
+                    </Button>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                        <Image Source="./Images/Toobar16.png"/>
+                    </Button>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                        <Image Source="./Images/Toobar3.png"/>
+                    </Button>
+                    <Button x:Name="btnColour" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnColour_Click">
+                        <Image Source="./Images/Toobar23.png"/>
+                    </Button>
+                    <Button x:Name="btnThickness" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0" Click="BtnThickness_Click">
+                        <Image Source="./Images/Toobar1.png"/>
+                    </Button>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,5,0,0">
+                        <Image Source="./Images/Toobar18.png"/>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <!--字体颜色-->
+            <Grid Grid.Row="0" x:Name="gridColour" Visibility="Collapsed">
+                <Image Source="./Images/Toobar20.png" HorizontalAlignment="Right" Margin="0,200,62,0"/>
+                <StackPanel Orientation="Vertical" HorizontalAlignment="Right" Margin="0,215,68,0">
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="15" Width="15" Margin="0,0,0,0"/>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FF0000" Height="15" Width="15" Margin="0,8,0,0"/>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#A7A9AC" Height="15" Width="15" Margin="0,8,0,0"/>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#63D600" Height="15" Width="15" Margin="0,8,0,0"/>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFBC00" Height="15" Width="15" Margin="0,8,0,0"/>
+                    <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#00B4FC" Height="15" Width="15" Margin="0,8,0,0"/>
+                </StackPanel>
+            </Grid>
             <!--字体粗细-->
-            <Image Grid.Row="0"  Source="./Images/Toobar21.png" HorizontalAlignment="Right" Margin="0,200,62,0" Visibility="Collapsed"/>
-            <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,260,62,0" Visibility="Collapsed">
+            <Grid Grid.Row="0" x:Name="gridThickness" Visibility="Collapsed">
+                <Image Grid.Row="0"  Source="./Images/Toobar21.png" HorizontalAlignment="Right" Margin="0,200,62,0"/>
+            <StackPanel Grid.Row="0" Orientation="Vertical" HorizontalAlignment="Right" Margin="0,260,62,0">
                 <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="3" Width="20" Margin="0,0,0,0"/>
                 <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="5" Width="20" Margin="0,10,0,0"/>
                 <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="10" Width="20" Margin="0,10,0,0"/>
             </StackPanel>
+            </Grid>
+            
                 <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
             <TextBlock Grid.Row="1" Text="01:35" FontSize="23" Foreground="#FFFFFF" Margin="30,50,0,0"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,15,0">
@@ -68,7 +79,7 @@
                 <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,15,0">
                     <Image Source="./Images/Toobar14.png"/>
                 </Button>
-                <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0">
+                <Button x:Name="btnBrush" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,10,0" Click="BtnBrush_Click">
                     <Image Source="./Images/Toobar8.png"/>
                 </Button>
             </StackPanel>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -23,5 +23,43 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
         }
+        /// <summary>
+        /// 画笔工具栏关闭事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnToolbarDown_Click(object sender, RoutedEventArgs e)
+        {
+            gridToolbar.Visibility = Visibility.Hidden;
+        }
+        /// <summary>
+        /// 画笔点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnBrush_Click(object sender, RoutedEventArgs e)
+        {
+            gridToolbar.Visibility = Visibility.Visible;
+        }
+        /// <summary>
+        /// 画笔粗细事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnThickness_Click(object sender, RoutedEventArgs e)
+        {
+            gridThickness.Visibility = Visibility.Visible;
+            gridColour.Visibility = Visibility.Collapsed;
+        }
+        /// <summary>
+        /// 画笔颜色事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnColour_Click(object sender, RoutedEventArgs e)
+        {
+            gridColour.Visibility = Visibility.Visible;
+            gridThickness.Visibility = Visibility.Collapsed;
+        }
     }
 }