diff --git a/App.config b/App.config index cf3eea2..94b743e 100644 --- a/App.config +++ b/App.config @@ -24,7 +24,7 @@ - + diff --git a/App.xaml.cs b/App.xaml.cs index 9446f2b..f67817b 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -3,6 +3,7 @@ using Microsoft.Win32; using System; using System.IO; using System.Windows; +using System.Windows.Media.Animation; using System.Windows.Threading; namespace GeekDesk diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml b/Control/UserControls/PannelCard/RightCardControl.xaml index 41f902e..0f9815d 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml +++ b/Control/UserControls/PannelCard/RightCardControl.xaml @@ -96,12 +96,12 @@ - diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml.cs b/Control/UserControls/PannelCard/RightCardControl.xaml.cs index a0ffde2..1e13a50 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml.cs +++ b/Control/UserControls/PannelCard/RightCardControl.xaml.cs @@ -190,6 +190,7 @@ namespace GeekDesk.Control.UserControls.PannelCard iconInfo.Name = path; } MainWindow.appData.MenuList[appData.AppConfig.SelectedMenuIndex].IconList.Add(iconInfo); + CommonCode.SaveAppData(MainWindow.appData); } } @@ -232,7 +233,7 @@ namespace GeekDesk.Control.UserControls.PannelCard private void StackPanel_MouseLeave(object sender, MouseEventArgs e) { - ImgStroyBoard(sender, (int)MainWindowEnum.IMAGE_HEIGHT, (int)MainWindowEnum.IMAGE_WIDTH, 500); + ImgStroyBoard(sender, (int)MainWindowEnum.IMAGE_HEIGHT, (int)MainWindowEnum.IMAGE_WIDTH, 250); } @@ -245,6 +246,7 @@ namespace GeekDesk.Control.UserControls.PannelCard Image img = sp.Children[0] as Image; + DoubleAnimation heightAnimation = new DoubleAnimation(); DoubleAnimation widthAnimation = new DoubleAnimation(); @@ -257,6 +259,10 @@ namespace GeekDesk.Control.UserControls.PannelCard heightAnimation.Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds)); widthAnimation.Duration = new Duration(TimeSpan.FromMilliseconds(milliseconds)); + + Timeline.SetDesiredFrameRate(heightAnimation, 60); + Timeline.SetDesiredFrameRate(widthAnimation, 60); + img.BeginAnimation(HeightProperty, heightAnimation); img.BeginAnimation(WidthProperty, widthAnimation); } diff --git a/Update.json b/Update.json index a63555c..09e2e28 100644 --- a/Update.json +++ b/Update.json @@ -1,9 +1,9 @@ { "title" : "版本更新", - "subTitle" : "V1.0-beta", + "subTitle" : "V2.0 正式版", "msgTitle" : "本次更新内容如下", - "msg" : "['更新测试1','更新测试23']", - "githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag/1.0-beta", - "giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases/1.0-beta", - "version": "1.0-beta" + "msg" : "['断网时检测更新不再弹框提示了','修复历史待办任务保存时程序崩溃bug','修复某些图标获取过小的bug','添加待办任务设置成功提醒功能','添加性能模式','添加调用系统菜单']", + "githubUrl" : "https://github.com/Demo-Liu/GeekDesk/releases/tag/2.0", + "giteeUrl" : "https://gitee.com/demo_liu/GeekDesk/releases/2.0", + "version": "2.0" } \ No newline at end of file