代码清理/拾色器功能/部分程序优化

2022-05-20 15:39:52 +08:00
parent 5cfaf9a37d
commit d01a27b827
83 changed files with 1320 additions and 627 deletions
--- a/Control/UserControls/Config/AboutControl.xaml.cs
+++ b/Control/UserControls/Config/AboutControl.xaml.cs
@@ -1,20 +1,9 @@
-using System;
+using GeekDesk.Constant;
+using GeekDesk.Util;
 using System.Configuration;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using GeekDesk.Util;
-using GeekDesk.Constant;

 namespace GeekDesk.Control.UserControls.Config
 {
--- a/Control/UserControls/Config/MotionControl.xaml
+++ b/Control/UserControls/Config/MotionControl.xaml
@@ -4,10 +4,13 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
             xmlns:cvt="clr-namespace:GeekDesk.Converts"
-             xmlns:hc="https://handyorg.github.io/handycontrol"
             mc:Ignorable="d" 
+             xmlns:hc="https://handyorg.github.io/handycontrol" 
+             xmlns:viewmodel="clr-namespace:GeekDesk.ViewModel" 
+             d:DataContext="{d:DesignInstance Type=viewmodel:AppConfig}"
+             xmlns:cst="clr-namespace:GeekDesk.Constant"
             Background="Transparent"
-             d:DesignHeight="300" d:DesignWidth="450">
+             d:DesignHeight="400" d:DesignWidth="450">

    <UserControl.Resources>
        <cvt:HideTypeConvert x:Key="HideTypeConvert"/>
@@ -109,30 +112,74 @@
                <TextBlock Text="热键设置" VerticalAlignment="Center"/>
            </hc:UniformSpacingPanel>
            <hc:UniformSpacingPanel Spacing="10"  Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="主面板:" VerticalAlignment="Center" Width="55"/>
+                <TextBlock Text="主面板:" VerticalAlignment="Center" Margin="0,5,0,0" Width="55"/>
                <hc:TextBox HorizontalAlignment="Left" 
-                        Tag="Main"
+                        Tag="{x:Static cst:HotKeyType.Main}"
                        VerticalAlignment="Top" 
                        IsReadOnly="True" 
                        IsReadOnlyCaretVisible="True" 
-                        Width="200"
+                        Width="170"
                        Text="{Binding HotkeyStr}" 
                        KeyDown="HotKeyDown"
                        KeyUp="HotKeyUp"
                        />
+                <CheckBox Content="启用" 
+                          Click="EnableHotKey_Click" 
+                          Tag="{x:Static cst:HotKeyType.Main}" 
+                          IsChecked="{Binding EnableAppHotKey}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
            </hc:UniformSpacingPanel>
            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="新建待办:"  Width="55"/>
+                <TextBlock Text="新建待办:" Margin="0,5,0,0"  Width="55"/>
                <hc:TextBox HorizontalAlignment="Left" 
-                        Tag="ToDo"
+                        Tag="{x:Static cst:HotKeyType.ToDo}"
                        VerticalAlignment="Top" 
                        IsReadOnly="True" 
                        IsReadOnlyCaretVisible="True" 
-                        Width="200"
+                        Width="170"
                        Text="{Binding ToDoHotkeyStr}" 
                        KeyDown="HotKeyDown"
                        KeyUp="HotKeyUp"
                        />
+                <CheckBox Content="启用" 
+                          Click="EnableHotKey_Click" 
+                          Tag="{x:Static cst:HotKeyType.ToDo}" 
+                          IsChecked="{Binding EnableTodoHotKey}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
+            </hc:UniformSpacingPanel>
+
+            <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
+                <TextBlock Text="拾色器:" Margin="0,5,0,0"  Width="55"/>
+                <hc:TextBox HorizontalAlignment="Left" 
+                        Tag="{x:Static cst:HotKeyType.ColorPicker}"
+                        VerticalAlignment="Top" 
+                        IsReadOnly="True" 
+                        IsReadOnlyCaretVisible="True" 
+                        Width="170"
+                        Text="{Binding ColorPickerHotkeyStr}" 
+                        KeyDown="HotKeyDown"
+                        KeyUp="HotKeyUp"
+                        />
+                <CheckBox Content="启用" 
+                          Tag="{x:Static cst:HotKeyType.ColorPicker}"
+                          Click="EnableHotKey_Click"
+                          IsChecked="{Binding EnableColorPickerHotKey}">
+                    <CheckBox.Background>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </CheckBox.Background>
+                </CheckBox>
            </hc:UniformSpacingPanel>
        </StackPanel>
    </Grid>
--- a/Control/UserControls/Config/MotionControl.xaml.cs
+++ b/Control/UserControls/Config/MotionControl.xaml.cs
@@ -1,26 +1,12 @@
 using GeekDesk.Constant;
-using GeekDesk.Control.Windows;
 using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using HandyControl.Data;
-using Microsoft.Win32;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using static GeekDesk.Util.GlobalHotKey;

 namespace GeekDesk.Control.UserControls.Config
@@ -48,7 +34,7 @@ namespace GeekDesk.Control.UserControls.Config
        /// <param name="e"></param>
        private void HotKeyDown(object sender, KeyEventArgs e)
        {
-            string tag = (sender as TextBox).Tag.ToString();
+            HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;

            Key downKey = e.Key;
            if (downKey == Key.System)
@@ -56,47 +42,59 @@ namespace GeekDesk.Control.UserControls.Config
                downKey = e.SystemKey;
            }

-            bool main = false;
-            if ("Main".Equals(tag))
-            {
-                main = true;
-            }
+            if (!CheckIsEnable(hkType)) return;
+

            if (prevKeyTemp == Key.None || prevKeyTemp != downKey)
            {
                if (hotkeyFinished)
                {
-                    if (main)
+
+                    switch (hkType)
                    {
-                        appConfig.Hotkey = 0;
-                        appConfig.HotkeyStr = "";
-                        appConfig.HotkeyModifiers = 0;
-                    }
-                    else
-                    {
-                        appConfig.ToDoHotkey = 0;
-                        appConfig.ToDoHotkeyStr = "";
-                        appConfig.ToDoHotkeyModifiers = 0;
+                        case HotKeyType.Main:
+                            appConfig.Hotkey = 0;
+                            appConfig.HotkeyStr = "";
+                            appConfig.HotkeyModifiers = 0;
+                            break;
+                        case HotKeyType.ToDo:
+                            appConfig.ToDoHotkey = 0;
+                            appConfig.ToDoHotkeyStr = "";
+                            appConfig.ToDoHotkeyModifiers = 0;
+                            break;
+                        case HotKeyType.ColorPicker:
+                            appConfig.ColorPickerHotkey = 0;
+                            appConfig.ColorPickerHotkeyStr = "";
+                            appConfig.ColorPickerHotkeyModifiers = 0;
+                            break;
                    }
                    hotkeyFinished = false;
                }
                //首次按下按键
-                if ((main && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
-                    || (!main && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0)))
+                if ((HotKeyType.Main == hkType && (appConfig.HotkeyStr == null || appConfig.HotkeyStr.Length == 0))
+                    || (HotKeyType.ToDo == hkType && (appConfig.ToDoHotkeyStr == null || appConfig.ToDoHotkeyStr.Length == 0))
+                    || (HotKeyType.ColorPicker == hkType && (appConfig.ColorPickerHotkeyStr == null || appConfig.ColorPickerHotkeyStr.Length == 0))
+                    )
                {
                    if (CheckModifierKeys(downKey))
                    {
                        //辅助键
-                        if (main)
+                        switch (hkType)
                        {
-                            appConfig.HotkeyStr = GetKeyName(downKey);
-                            appConfig.HotkeyModifiers = GetModifierKeys(downKey);
-                        }
-                        else
-                        {
-                            appConfig.ToDoHotkeyStr = GetKeyName(downKey);
-                            appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
+                            case HotKeyType.Main:
+                                appConfig.HotkeyStr = GetKeyName(downKey);
+                                appConfig.HotkeyModifiers = GetModifierKeys(downKey);
+                                break;
+                            case HotKeyType.ToDo:
+                                appConfig.ToDoHotkeyStr = GetKeyName(downKey);
+                                appConfig.ToDoHotkeyModifiers = GetModifierKeys(downKey);
+                                break;
+                            case HotKeyType.ColorPicker:
+                                appConfig.ColorPickerHotkeyStr = GetKeyName(downKey);
+                                appConfig.ColorPickerHotkeyModifiers = GetModifierKeys(downKey);
+                                break;
                        }
+
                        prevKeyTemp = downKey;
                        keysTemp.Add(e);
                    }
@@ -109,30 +107,41 @@ namespace GeekDesk.Control.UserControls.Config
                        || (downKey >= Key.F1 && downKey <= Key.F12)
                        || (downKey >= Key.D0 && downKey <= Key.D9)))
                    {
-                        if (main)
+                        switch (hkType)
                        {
-                            appConfig.Hotkey = downKey;
-                            appConfig.HotkeyStr += downKey.ToString();
-                        }
-                        else
-                        {
-                            appConfig.ToDoHotkey = downKey;
-                            appConfig.ToDoHotkeyStr += downKey.ToString();
+                            case HotKeyType.Main:
+                                appConfig.Hotkey = downKey;
+                                appConfig.HotkeyStr += downKey.ToString();
+                                break;
+                            case HotKeyType.ToDo:
+                                appConfig.ToDoHotkey = downKey;
+                                appConfig.ToDoHotkeyStr += downKey.ToString();
+                                break;
+                            case HotKeyType.ColorPicker:
+                                appConfig.ColorPickerHotkey = downKey;
+                                appConfig.ColorPickerHotkeyStr += downKey.ToString();
+                                break;
                        }
+
                        prevKeyTemp = downKey;
                        keysTemp.Add(e);
                    }
                    else if (CheckModifierKeys(downKey))
                    {
-                        if (main)
+                        switch (hkType)
                        {
-                            appConfig.HotkeyStr += GetKeyName(downKey);
-                            appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
-                        }
-                        else
-                        {
-                            appConfig.ToDoHotkeyStr += GetKeyName(downKey);
-                            appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
+                            case HotKeyType.Main:
+                                appConfig.HotkeyStr += GetKeyName(downKey);
+                                appConfig.HotkeyModifiers |= GetModifierKeys(downKey);
+                                break;
+                            case HotKeyType.ToDo:
+                                appConfig.ToDoHotkeyStr += GetKeyName(downKey);
+                                appConfig.ToDoHotkeyModifiers |= GetModifierKeys(downKey);
+                                break;
+                            case HotKeyType.ColorPicker:
+                                appConfig.ColorPickerHotkeyStr += GetKeyName(downKey);
+                                appConfig.ColorPickerHotkeyModifiers |= GetModifierKeys(downKey);
+                                break;
                        }

                        prevKeyTemp = downKey;
@@ -194,12 +203,10 @@ namespace GeekDesk.Control.UserControls.Config
        [MethodImpl(MethodImplOptions.Synchronized)]
        private void HotKeyUp(object sender, KeyEventArgs e)
        {
-            string tag = (sender as TextBox).Tag.ToString();
-            bool main = false;
-            if ("Main".Equals(tag))
-            {
-                main = true;
-            }
+            HotKeyType hkType = (HotKeyType)(sender as TextBox).Tag;
+
+            if (!CheckIsEnable(hkType)) return;
+
            lock (this)
            {
                bool allKeyUp = true;
@@ -218,30 +225,52 @@ namespace GeekDesk.Control.UserControls.Config
                    prevKeyTemp = Key.None;
                    hotkeyFinished = true;

-                    if (main)
+                    switch (hkType)
                    {
-                        if (MainWindow.hotKeyId != -1)
-                        {
-                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
-                            GlobalHotKey.Dispose(MainWindow.hotKeyId);
-                        }
-                        MainWindow.RegisterHotKey(false);
+                        case HotKeyType.Main:
+                            if (MainWindow.hotKeyId != -1)
+                            {
+                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.mainWindow).Handle, Hotkey.keymap[MainWindow.hotKeyId]);
+                                GlobalHotKey.Dispose(MainWindow.hotKeyId);
+                            }
+                            MainWindow.RegisterHotKey(false);
+                            break;
+                        case HotKeyType.ToDo:
+                            if (MainWindow.toDoHotKeyId != -1)
+                            {
+                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
+                                GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
+                            }
+                            MainWindow.RegisterCreateToDoHotKey(false);
+                            break;
+                        case HotKeyType.ColorPicker:
+                            if (MainWindow.colorPickerHotKeyId != -1)
+                            {
+                                //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
+                                GlobalHotKey.Dispose(MainWindow.colorPickerHotKeyId);
+                            }
+                            MainWindow.RegisterColorPickerHotKey(false);
+                            break;
                    }
-                    else
-                    {
-                        if (MainWindow.toDoHotKeyId != -1)
-                        {
-                            //Hotkey.UnRegist(new WindowInteropHelper(MainWindow.toDoInfoWindow).Handle, Hotkey.keymap[MainWindow.toDoHotKeyId]);
-                            GlobalHotKey.Dispose(MainWindow.toDoHotKeyId);
-                        }
-                        MainWindow.RegisterCreateToDoHotKey(false);
-                    }
-

                }
            }
        }

+        private bool CheckIsEnable(HotKeyType hkType)
+        {
+            switch (hkType)
+            {
+                case HotKeyType.Main:
+                    return true == appConfig.EnableAppHotKey;
+                case HotKeyType.ToDo:
+                    return true == appConfig.EnableTodoHotKey;
+                case HotKeyType.ColorPicker:
+                    return true == appConfig.EnableColorPickerHotKey;
+            }
+            return false;
+        }
+
        /// <summary>
        /// 移动窗口
        /// </summary>
@@ -295,5 +324,29 @@ namespace GeekDesk.Control.UserControls.Config
            }
        }

+        /// <summary>
+        /// 启用热键
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void EnableHotKey_Click(object sender, RoutedEventArgs e)
+        {
+            HotKeyType hkType = (HotKeyType)(sender as CheckBox).Tag;
+            switch (hkType)
+            {
+                case HotKeyType.Main:
+                    if (true == appConfig.EnableAppHotKey)
+                    MainWindow.RegisterHotKey(false);
+                    break;
+                case HotKeyType.ToDo:
+                    if (true == appConfig.EnableTodoHotKey)
+                        MainWindow.RegisterCreateToDoHotKey(false);
+                    break;
+                case HotKeyType.ColorPicker:
+                    if (true == appConfig.EnableColorPickerHotKey)
+                        MainWindow.RegisterColorPickerHotKey(false);
+                    break;
+            }
+        }
    }
 }
--- a/Control/UserControls/Config/OtherControl.xaml.cs
+++ b/Control/UserControls/Config/OtherControl.xaml.cs
@@ -1,20 +1,9 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;

 namespace GeekDesk.Control.UserControls.Config
 {
--- a/Control/UserControls/Config/ThemeControl.xaml
+++ b/Control/UserControls/Config/ThemeControl.xaml
@@ -18,7 +18,7 @@
        <cvt:Visibility2BooleanConverter x:Key="Visibility2BooleanConverter"/>
    </UserControl.Resources>
    <Grid>
-        <Grid  MouseDown="DragMove" Background="Transparent">
+        <Grid Background="Transparent">
            <StackPanel Margin="20" >
                <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
                    <TextBlock Text="背景风格" VerticalAlignment="Center"/>
@@ -228,10 +228,10 @@
                <SolidColorBrush Color="AliceBlue" Opacity="0.01"/>
            </StackPanel.Background>-->

-            <hc:ColorPicker Name="MyColorPicker" 
+            <!--<hc:ColorPicker Name="MyColorPicker" 
                            Canceled="MyColorPicker_Canceled"
                            Confirmed="MyColorPicker_Confirmed"
-                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>
+                            SelectedColorChanged="MyColorPicker_SelectedColorChanged"/>-->

        <!--</StackPanel>-->
    </Grid>
--- a/Control/UserControls/Config/ThemeControl.xaml.cs
+++ b/Control/UserControls/Config/ThemeControl.xaml.cs
@@ -1,53 +1,28 @@
 using GeekDesk.Constant;
 using GeekDesk.Control.Other;
-using GeekDesk.Control.Windows;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;

 namespace GeekDesk.Control.UserControls.Config
 {

-    enum ColorType
-    {
-        COLOR_1 = 1,
-        COLOR_2 = 2,
-        TEXT_COLOR = 3
-    }
-
    /// <summary>
    /// MotionControl.xaml 的交互逻辑
    /// </summary>
    public partial class ThemeControl : System.Windows.Controls.UserControl
    {
-        private static ColorType colorType;
        private static AppConfig appConfig = MainWindow.appData.AppConfig;

-        private System.Windows.Controls.Primitives.ToggleButton toggleButton = null;
        public ThemeControl()
        {
-            
+
            InitializeComponent();
            if (appConfig.BGStyle != BGStyle.GradientBac)
            {
@@ -111,60 +86,9 @@ namespace GeekDesk.Control.UserControls.Config
        private void ColorButton_Click(object sender, RoutedEventArgs e)
        {
            string tag = (sender as Button).Tag.ToString();
-            switch (tag)
-            {
-                case "Color1":
-                    colorType = ColorType.COLOR_1;break;
-                case "Color2":
-                    colorType = ColorType.COLOR_2;break;
-                default:
-                    colorType = ColorType.TEXT_COLOR;break;
-            }
-            MyColorPicker.Visibility = Visibility.Visible;
-            new ColorPickerWindow().Show();
+            new MyColorPickerDialog(tag, "ConfigWindowDialog");
        }

-        /// <summary>
-        /// 取消按钮事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MyColorPicker_Canceled(object sender, EventArgs e)
-        {
-            MyColorPickerClose(sender);
-        }
-        private void MyColorPicker_Confirmed(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
-        {
-            MyColorPickerClose(sender);
-        }
-
-        private void MyColorPicker_SelectedColorChanged(object sender, HandyControl.Data.FunctionEventArgs<Color> e)
-        {
-            SolidColorBrush scb = MyColorPicker.SelectedBrush;
-
-            switch (colorType)
-            {
-                case ColorType.COLOR_1:
-                    appConfig.GradientBGParam.Color1 = scb.ToString();break;
-                case ColorType.COLOR_2:
-                    appConfig.GradientBGParam.Color2 = scb.ToString(); break;
-                default:
-                    appConfig.TextColor = scb.ToString();break;
-            }
-        }
-
-        /// <summary>
-        /// 移动窗口
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void DragMove(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                Window.GetWindow(this).DragMove();
-            }
-        }

        private void PreviewSlider_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
        {
@@ -174,6 +98,7 @@ namespace GeekDesk.Control.UserControls.Config
            };
            System.Threading.ThreadStart ts = new System.Threading.ThreadStart(cbu.CheckButtonUp);
            System.Threading.Thread t = new System.Threading.Thread(ts);
+            t.IsBackground = true;
            t.Start();
        }

@@ -201,25 +126,6 @@ namespace GeekDesk.Control.UserControls.Config
            }
        }

-        private void MyColorPicker_Checked(object sender, RoutedEventArgs e)
-        {
-            toggleButton = e.OriginalSource as System.Windows.Controls.Primitives.ToggleButton;
-        }
-
-
-        private void MyColorPickerClose(object sender)
-        {
-            if (toggleButton != null && toggleButton.IsChecked == true)
-            {
-                HandyControl.Controls.ColorPicker cp = sender as HandyControl.Controls.ColorPicker;
-                const BindingFlags InstanceBindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-                Type type = cp.GetType();
-                toggleButton.IsChecked = false;
-                MethodInfo mi = type.GetMethod("ToggleButtonDropper_Click", InstanceBindFlags);
-                mi.Invoke(cp, new object[] { null, null });
-            }
-            MyColorPicker.Visibility = Visibility.Collapsed;
-        }

        public void BGStyle_Changed(object sender, RoutedEventArgs e)
        {
@@ -228,7 +134,8 @@ namespace GeekDesk.Control.UserControls.Config
            {
                GradientBGConf.Visibility = Visibility.Collapsed;
                ImgBGConf.Visibility = Visibility.Visible;
-            } else
+            }
+            else
            {
                ImgBGConf.Visibility = Visibility.Collapsed;
                GradientBGConf.Visibility = Visibility.Visible;
@@ -248,7 +155,7 @@ namespace GeekDesk.Control.UserControls.Config
        private void SysBG_Click(object sender, RoutedEventArgs e)
        {
            GradientBGDialog gbg = new GradientBGDialog();
-            gbg.dialog = HandyControl.Controls.Dialog.Show(gbg, "SysBGDialog");
+            gbg.dialog = HandyControl.Controls.Dialog.Show(gbg, "ConfigWindowDialog");
        }
    }
 }
--- a/Control/UserControls/IconFont/IconPannel.xaml.cs
+++ b/Control/UserControls/IconFont/IconPannel.xaml.cs
@@ -1,18 +1,4 @@
-using GeekDesk.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;

 namespace GeekDesk.Control.UserControls.IconFont
 {
--- a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
+++ b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs
@@ -1,7 +1,6 @@
 using DraggAnimatedPanelExample;
 using GeekDesk.Constant;
 using GeekDesk.Control.Windows;
-using GeekDesk.MyThread;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using System;
@@ -10,10 +9,8 @@ using System.Collections.ObjectModel;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Threading;

 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -33,7 +30,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
        public LeftCardControl()
        {
            InitializeComponent();
-           
+

            this.Loaded += (s, e) =>
            {
@@ -44,7 +41,7 @@ namespace GeekDesk.Control.UserControls.PannelCard


        private void SetMenuListBoxItemEvent()
-        {            
+        {
            int size = MenuListBox.Items.Count;
            for (int i = 0; i < size; i++)
            {
@@ -87,7 +84,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
            }
        }

-    DelegateCommand<int[]> _swap;
+        DelegateCommand<int[]> _swap;

        public DelegateCommand<int[]> SwapCommand
        {
@@ -333,7 +330,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
        {
            if (appData.AppConfig.HoverMenu && !IS_EDIT)
            {
-                new Thread(() =>
+                Thread t = new Thread(() =>
                {
                    Thread.Sleep(200);
                    this.Dispatcher.Invoke(() =>
@@ -345,7 +342,9 @@ namespace GeekDesk.Control.UserControls.PannelCard
                            MenuListBox.SelectedIndex = index;
                        }
                    });
-                }).Start();
+                });
+                t.IsBackground = true;
+                t.Start();
            }
        }

@@ -356,7 +355,8 @@ namespace GeekDesk.Control.UserControls.PannelCard
        /// <param name="e"></param>
        private void ListBoxItem_MouseDown(object sender, MouseButtonEventArgs e)
        {
-            if (RunTimeStatus.SEARCH_BOX_SHOW) {
+            if (RunTimeStatus.SEARCH_BOX_SHOW)
+            {
                MainWindow.mainWindow.HidedSearchBox();
            }
        }
--- a/Control/UserControls/PannelCard/RightCardControl.xaml
+++ b/Control/UserControls/PannelCard/RightCardControl.xaml
@@ -176,7 +176,7 @@
                   VirtualizingPanel.IsContainerVirtualizable="True"
                   >
                    <UniformGrid x:Name="VerticalUFG">
-                        <hc:TransitioningContentControl TransitionMode="Fade">
+                        <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
                            <ListBox ItemsSource="{Binding Source={StaticResource SearchIconList},Path=IconList}" 
                             BorderThickness="0"
                             Padding="0,10,0,0"
--- a/Control/UserControls/PannelCard/RightCardControl.xaml.cs
+++ b/Control/UserControls/PannelCard/RightCardControl.xaml.cs
@@ -9,13 +9,11 @@ using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;

 namespace GeekDesk.Control.UserControls.PannelCard
 {
@@ -422,12 +420,31 @@ namespace GeekDesk.Control.UserControls.PannelCard
            double height = appData.AppConfig.ImageHeight;
            width += width * 0.15;
            height += height * 0.15;
-            ImgStoryBoard(sender, (int)width, (int)height, 1, true);
+            Thread t = new Thread(() =>
+            {
+                this.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    ImgStoryBoard(sender, (int)width, (int)height, 1, true);
+                }));
+            });
+            t.IsBackground = true;
+            t.Start();
+
        }

        private void StackPanel_MouseLeave(object sender, MouseEventArgs e)
        {
-            ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 220);
+
+            Thread t = new Thread(() =>
+            {
+                this.Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    ImgStoryBoard(sender, appData.AppConfig.ImageWidth, appData.AppConfig.ImageHeight, 260);
+                }));
+            });
+            t.IsBackground = true;
+            t.Start();
+
        }


@@ -491,6 +508,7 @@ namespace GeekDesk.Control.UserControls.PannelCard
                {
                    ThreadStart ts = new ThreadStart(crs.Remove);
                    System.Threading.Thread t = new System.Threading.Thread(ts);
+                    t.IsBackground = true;
                    t.Start();
                }
                else
--- a/Control/UserControls/SystemItem/SystemItem.xaml.cs
+++ b/Control/UserControls/SystemItem/SystemItem.xaml.cs
@@ -1,20 +1,8 @@
 using GeekDesk.Constant;
 using GeekDesk.Util;
 using GeekDesk.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;

 namespace GeekDesk.Control.UserControls.SystemItem
 {
@@ -47,7 +35,8 @@ namespace GeekDesk.Control.UserControls.SystemItem
                };
                iconInfo.Content_NoWrite = iconInfo.Name_NoWrite
                    + "\n使用次数:" + iconInfo.Count;
-            } else
+            }
+            else
            {
                //startupMenu or Store
                iconInfo = CommonCode.GetIconInfoByPath(thisInfo.LnkPath_NoWrite);
--- a/Control/UserControls/ToDo/TodoControl.xaml.cs
+++ b/Control/UserControls/ToDo/TodoControl.xaml.cs
@@ -3,19 +3,10 @@ using GeekDesk.Util;
 using GeekDesk.ViewModel;
 using HandyControl.Controls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;

 namespace GeekDesk.Control.UserControls.Backlog
 {