工具栏 缩放功能

XHWK.WKTool/App.config

@@ -32,8 +32,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="50" />
-    <add key="VersionName" value="2.5.0" />
+    <add key="VersionCode" value="51" />
+    <add key="VersionName" value="2.5.1" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/App.cs

@@ -189,6 +189,10 @@ namespace XHWK.WKTool
         /// 上传页面
         /// </summary>
         public static UploadWindow W_UploadWindow = null;
+        /// <summary>
+        /// 最小化工具栏
+        /// </summary>
+        public static MinToolbar W_MinToolbar = null;
         #endregion
         #endregion
 

XHWK.WKTool/MinToolbar.xaml

@@ -0,0 +1,40 @@
+<Window x:Class="XHWK.WKTool.MinToolbar"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XHWK.WKTool"
+        mc:Ignorable="d"
+        Title="MinToolbar" Height="50" Width="20" AllowsTransparency="True" 
+        Topmost="True"
+    ShowInTaskbar="False"
+    WindowStyle="None" Margin="0" Left="0" Top="0">
+    <Window.Background>
+        <SolidColorBrush Opacity="0" Color="#00000000" />
+    </Window.Background>
+    <Viewbox>
+        <Grid>
+            <Border Background="White" CornerRadius="3">
+                <Button x:Name="buttonMin" Height="25" Width="3"
+                        Margin="0.5"  Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                        MouseEnter="buttonMin_MouseEnter">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border
+                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderThickness="0"
+                                CornerRadius="3">
+                                <Border.Background>#2d8cf0</Border.Background>
+                                <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+            </Border>
+            
+        </Grid>
+    </Viewbox>
+</Window>

XHWK.WKTool/MinToolbar.xaml.cs

@@ -0,0 +1,49 @@
+
+using System;
+using System.Windows;
+
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// 最小化工具栏
+    /// </summary>
+    public partial class MinToolbar : Window
+    {
+        /// <summary>
+        /// 屏幕宽
+        /// </summary>
+        internal double pwidth = SystemParameters.PrimaryScreenWidth;
+
+        /// <summary>
+        /// 屏幕高
+        /// </summary>
+        internal double pHeight = SystemParameters.PrimaryScreenHeight;
+        public MinToolbar()
+        {
+            InitializeComponent();
+            ResizeMode = ResizeMode.NoResize;
+            Topmost = true;
+         
+        }
+        public void Initialize(double top)
+        {
+            var desktopWorkingArea = System.Windows.SystemParameters.WorkArea;
+            this.Left = desktopWorkingArea.Right - this.Width+7;
+            this.Top = top+330;
+
+            //Console.WriteLine(this.Top + "min");
+        }
+
+        private void buttonMin_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            this.Hide();
+            APP.W_ScreenRecordingToolbarWindow.MaxToobar();
+        }
+
+        private void buttonMin_MouseEnter_1(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+
+        }
+    }
+}

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.5.1.0")]
+[assembly: AssemblyFileVersion("2.5.1.0")]

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml

@@ -14,7 +14,7 @@
         <SolidColorBrush Opacity="0" Color="#292C2E" />
     </Window.Background>
     <Viewbox>
-        <Grid MouseLeftButtonDown="Grid_MouseLeftButtonDown">
+        <Grid x:Name="gridToobar" MouseLeftButtonDown="Grid_MouseLeftButtonDown">
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
@@ -72,7 +72,9 @@
                     <Button  Cursor="Hand" x:Name="btnCrude" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Background="#FFFFFF" Height="10" Width="20" Margin="0,10,0,0" Click="BtnCrude_Click"/>
                 </StackPanel>
             </Grid>
-
+            <Grid Grid.Row="1" x:Name="gridToobarTwo" MouseLeave="gridToobarTwo_MouseLeave">
+                
+           
             <Image Grid.Row="1"  Source="./Images/Toobar0.png"/>
             <Button Grid.Row="1" x:Name="BtnRecordingScreen" HorizontalAlignment="Left"  Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="46,0,15,0" ToolTip="开始" Click="BtnRecordingScreen_Click">
                 <Image x:Name="ImgRecordingScreen" Source="./Images/Toobar26.png"/>
@@ -103,6 +105,7 @@
                     </Border>
                 </Button>
             </StackPanel>
+            </Grid>
         </Grid>
     </Viewbox>
 </Window>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,6 +1,7 @@
 using Common.system;
 
 using System;
+using System.Drawing;
 using System.IO;
 using System.Threading;
 using System.Windows;
@@ -79,6 +80,7 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            gridToobar.Visibility = Visibility.Visible;
             if (APP.W_PracticeWindow == null)
             {
                 APP.W_PracticeWindow = new PracticeWindow
@@ -420,6 +422,15 @@ namespace XHWK.WKTool
                                                         //imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar30.png"));
                                                         //borOne.Background = new SolidColorBrush(Colors.LightBlue);
                 BtnRecordingScreen.ToolTip = "暂停";
+
+                if (APP.W_MinToolbar == null)
+                {
+                    APP.W_MinToolbar = new MinToolbar();
+
+                }
+                APP.W_MinToolbar.Initialize(this.Top);
+                gridToobar.Visibility = Visibility.Hidden;
+                APP.W_MinToolbar.Show();
                 try
                 {
                     #region 4秒内不可点击
@@ -552,6 +563,8 @@ namespace XHWK.WKTool
                 }))).Start();
             }
             #endregion
+            APP.W_MinToolbar.Hide();
+            BtnRecordingScreen.ToolTip = "开始";
             k_hook.Stop();
             IsSuspend = true;
             txbTime.Text = "00:00";
@@ -634,6 +647,14 @@ namespace XHWK.WKTool
             }
             Hide();
         }
+        public void MaxToobar()
+        {
+            Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
+            float DIP = graphics.DpiX;
+            float DIPY = graphics.DpiY;
+            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width + 10;
+            gridToobar.Visibility = Visibility.Visible;
+        }
         #endregion
 
         #region 画笔相关
@@ -1131,6 +1152,8 @@ namespace XHWK.WKTool
                     return;
                 }
                 k_hook.Stop();
+                BtnRecordingScreen.ToolTip = "开始";
+                APP.W_MinToolbar.Hide();
                 IsSuspend = true;
                 txbTime.Text = "00:00";
 
@@ -1229,6 +1252,35 @@ namespace XHWK.WKTool
             //SendKeys.SendWait("%{TAB}");
             MouseEventCommon.MouseMiddleClickEvent(0);
         }
+        bool isToobar = false;
+        /// <summary>
+        /// 在工具条区域内
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void gridToobarTwo_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            isToobar = true;
+        }
+
+        private void gridToobarTwo_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+        {
+            if(BtnRecordingScreen.ToolTip.ToString().Equals ("暂停")&& gridToobar.Visibility == Visibility.Visible)
+            {
+                if (APP.W_MinToolbar == null)
+                {
+                    APP.W_MinToolbar = new MinToolbar();
 
+                }
+                APP.W_MinToolbar.Initialize(this.Top);
+                //else
+                //{
+                //    APP.W_CountdownWindow.Initialize(true, 1800);
+                //}
+                gridToobar.Visibility = Visibility.Hidden;
+                APP.W_MinToolbar.Show();
+                Console.WriteLine(this.Top+"max");
+            }
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -2843,7 +2843,7 @@ namespace XHWK.WKTool
             Graphics graphics = Graphics.FromHwnd(IntPtr.Zero);
             float DIP = graphics.DpiX;
             float DIPY = graphics.DpiY;
-            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width - 60;
+            APP.W_ScreenRecordingToolbarWindow.Left = PrimaryScreen.WorkingArea.Width / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Width+10 ;
             APP.W_ScreenRecordingToolbarWindow.Top = PrimaryScreen.WorkingArea.Height / (DIP / 96) - APP.W_ScreenRecordingToolbarWindow.Height - 30;
             APP.W_ScreenRecordingToolbarWindow.Topmost = true;
             APP.W_ScreenRecordingToolbarWindow.Show();

XHWK.WKTool/XHWK.WKTool.csproj

@@ -161,6 +161,9 @@
     <Compile Include="MessageWindow.xaml.cs">
       <DependentUpon>MessageWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="MinToolbar.xaml.cs">
+      <DependentUpon>MinToolbar.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Models\AppModel.cs" />
     <Compile Include="Models\Direction.cs" />
     <Compile Include="Models\EntityBase.cs" />
@@ -224,6 +227,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MinToolbar.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="PracticeWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>