michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

code_review: PR #734

Browse source 
* remove unnecessary namespace using
* do NOT set tooltip currently, because CommitDetail.GetParent may cause UI lags and the tooltip DataTemplate is not provided.
* add translations for zh_CN and zh_TW

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-11-24 11:04:59 +08:00
parent 53220f9a36
commit 457a1e79c7
No known key found for this signature in database
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Resources/Locales/zh_CN.axaml
View file

@ -606,6 +606,7 @@
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">软件更新</x:String>
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">当前已是最新版本。</x:String>
<x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">复制提交指纹</x:String>
<x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">跳转到提交</x:String>
<x:String x:Key="Text.Squash" xml:space="preserve">压缩为单个提交</x:String>
<x:String x:Key="Text.Squash.Into" xml:space="preserve">合并入：</x:String>
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH密钥 ：</x:String>

1
src/Resources/Locales/zh_TW.axaml
View file

@ -605,6 +605,7 @@
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">軟體更新</x:String>
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">目前已是最新版本。</x:String>
<x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">複製提交編號</x:String>
<x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">導覽到提交</x:String>
<x:String x:Key="Text.Squash" xml:space="preserve">壓縮為單個提交</x:String>
<x:String x:Key="Text.Squash.Into" xml:space="preserve">合併入:</x:String>
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH 金鑰:</x:String>

8
src/Views/CommitMessagePresenter.cs
View file

@ -7,7 +7,6 @@ using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using Avalonia.Input;
using Avalonia.Platform.Storage;
using Avalonia.VisualTree;
namespace SourceGit.Views
@ -115,7 +114,7 @@ namespace SourceGit.Views
{
base.OnPointerMoved(e);
if (e.Pointer.Captured == this)
if (Equals(e.Pointer.Captured, this))
{
var relativeSelfY = e.GetPosition(this).Y;
if (relativeSelfY <= 0 || relativeSelfY > Bounds.Height)
@ -155,11 +154,6 @@ namespace SourceGit.Views
ToolTip.SetTip(this, match.Link);
ToolTip.SetIsOpen(this, true);
}
else if (this.FindAncestorOfType<CommitBaseInfo>() is { DataContext: ViewModels.CommitDetail detail } && detail.GetParent(match.Link) is Models.Commit c)
{
ToolTip.SetTip(this, c);
ToolTip.SetIsOpen(this, true);
}
return;
}