From 4d416e673e2a00ccd819fb2595d381780161f9a2 Mon Sep 17 00:00:00 2001 From: liufei Date: Thu, 13 Jan 2022 09:49:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=8B=96=E5=8A=A8=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PannelCard/RightCardControl.xaml | 3 ++- .../PannelCard/RightCardControl.xaml.cs | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml b/Control/UserControls/PannelCard/RightCardControl.xaml index e46fb9c..9adaa0e 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml +++ b/Control/UserControls/PannelCard/RightCardControl.xaml @@ -104,7 +104,8 @@ hc:Poptip.Content="{Binding Content}" hc:Poptip.Placement="BottomLeft" Background="#00FFFFFF" - MouseLeftButtonDown="IconClick" + MouseLeftButtonDown="Icon_MouseLeftButtonDown" + MouseLeftButtonUp="Icon_MouseLeftButtonUp" MouseEnter="StackPanel_MouseEnter" MouseLeave="StackPanel_MouseLeave" > diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml.cs b/Control/UserControls/PannelCard/RightCardControl.xaml.cs index f7b3b0d..2a33414 100644 --- a/Control/UserControls/PannelCard/RightCardControl.xaml.cs +++ b/Control/UserControls/PannelCard/RightCardControl.xaml.cs @@ -60,6 +60,23 @@ namespace GeekDesk.Control.UserControls.PannelCard + + private void Icon_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + if (appData.AppConfig.DoubleOpen) + { + IconClick(sender, e); + } + } + + private void Icon_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + if (!appData.AppConfig.DoubleOpen) + { + IconClick(sender, e); + } + } + /// /// 图标点击事件 /// @@ -521,5 +538,6 @@ namespace GeekDesk.Control.UserControls.PannelCard { SystemItemWindow.Show(); } + } } From c062f332ff47c5c5b2daf884ec2478a95ebcb650 Mon Sep 17 00:00:00 2001 From: liufei Date: Thu, 13 Jan 2022 09:49:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=81=AE=E6=8C=A1?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Util/ShowWindowFollowMouse.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Util/ShowWindowFollowMouse.cs b/Util/ShowWindowFollowMouse.cs index b5db6ec..93934a0 100644 --- a/Util/ShowWindowFollowMouse.cs +++ b/Util/ShowWindowFollowMouse.cs @@ -27,7 +27,7 @@ namespace GeekDesk.Util double left = SystemParameters.VirtualScreenLeft; double top = SystemParameters.VirtualScreenTop; double width = SystemParameters.VirtualScreenWidth; - double height = SystemParameters.VirtualScreenHeight; + double height = SystemParameters.WorkArea.Height + 20; double right = width - Math.Abs(left); double bottom = height - Math.Abs(top); From fadf020ecf1c4554eb10ab9854c222e603559ce4 Mon Sep 17 00:00:00 2001 From: liufei Date: Thu, 13 Jan 2022 09:49:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Update.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Update.json b/Update.json index efb7c43..d27655c 100644 --- a/Update.json +++ b/Update.json @@ -1,9 +1,9 @@ { "title": "GeekDesk版本更新", - "subTitle": "V2.4.11", + "subTitle": "V2.4.12", "msgTitle": "本次更新内容如下", - "msg": "['各位兄弟去给我点个免费Star呗','增加添加系统和开始菜单应用功能','增加项目启动参数','优化贴边隐藏动画效果(可能现在并不完美)','增加双击打开功能','修复cron表达式任务无限重启','其它已知问题修复(如果有人发现)']", + "msg": "['各位兄弟去给我点个免费Star呗','这是个修复版本,主要修复上个版本的bug','修复图标无法拖动','修复界面遮挡任务栏']", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", - "version": "2.4.11" + "version": "2.4.12" } \ No newline at end of file From 9bf0e6ad23e9ef85bcbc350600bb7c5eae710724 Mon Sep 17 00:00:00 2001 From: liufei Date: Thu, 13 Jan 2022 09:53:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=9B=86=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.config | 2 +- Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/App.config b/App.config index bb13005..4ca7a5b 100644 --- a/App.config +++ b/App.config @@ -44,7 +44,7 @@ - + diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index f001dc7..2273780 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.1.1")] -[assembly: AssemblyFileVersion("2.4.1.1")] +[assembly: AssemblyVersion("2.4.1.2")] +[assembly: AssemblyFileVersion("2.4.1.2")]