Skip to content

Commit 457a1e7

Browse files
committed
code_review: PR #734
* 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 <[email protected]>
1 parent 53220f9 commit 457a1e7

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,7 @@
606606
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">软件更新</x:String>
607607
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">当前已是最新版本。</x:String>
608608
<x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">复制提交指纹</x:String>
609+
<x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">跳转到提交</x:String>
609610
<x:String x:Key="Text.Squash" xml:space="preserve">压缩为单个提交</x:String>
610611
<x:String x:Key="Text.Squash.Into" xml:space="preserve">合并入:</x:String>
611612
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH密钥 :</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@
605605
<x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">軟體更新</x:String>
606606
<x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">目前已是最新版本。</x:String>
607607
<x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">複製提交編號</x:String>
608+
<x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">導覽到提交</x:String>
608609
<x:String x:Key="Text.Squash" xml:space="preserve">壓縮為單個提交</x:String>
609610
<x:String x:Key="Text.Squash.Into" xml:space="preserve">合併入:</x:String>
610611
<x:String x:Key="Text.SSHKey" xml:space="preserve">SSH 金鑰:</x:String>

src/Views/CommitMessagePresenter.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Avalonia.Controls;
88
using Avalonia.Controls.Documents;
99
using Avalonia.Input;
10-
using Avalonia.Platform.Storage;
1110
using Avalonia.VisualTree;
1211

1312
namespace SourceGit.Views
@@ -115,7 +114,7 @@ protected override void OnPointerMoved(PointerEventArgs e)
115114
{
116115
base.OnPointerMoved(e);
117116

118-
if (e.Pointer.Captured == this)
117+
if (Equals(e.Pointer.Captured, this))
119118
{
120119
var relativeSelfY = e.GetPosition(this).Y;
121120
if (relativeSelfY <= 0 || relativeSelfY > Bounds.Height)
@@ -155,11 +154,6 @@ protected override void OnPointerMoved(PointerEventArgs e)
155154
ToolTip.SetTip(this, match.Link);
156155
ToolTip.SetIsOpen(this, true);
157156
}
158-
else if (this.FindAncestorOfType<CommitBaseInfo>() is { DataContext: ViewModels.CommitDetail detail } && detail.GetParent(match.Link) is Models.Commit c)
159-
{
160-
ToolTip.SetTip(this, c);
161-
ToolTip.SetIsOpen(this, true);
162-
}
163157

164158
return;
165159
}

0 commit comments

Comments
 (0)