mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-11-01 13:13:21 -07:00
fix: sometimes textblock with issue link will render nothing
This commit is contained in:
parent
ec14d9d533
commit
55da40f8dc
5 changed files with 163 additions and 11 deletions
|
@ -284,9 +284,6 @@
|
||||||
<Style Selector="Run.issue_link">
|
<Style Selector="Run.issue_link">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource Brush.Link}"/>
|
<Setter Property="Foreground" Value="{DynamicResource Brush.Link}"/>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="Run.issue_link.issue_link_hovered">
|
|
||||||
<Setter Property="TextDecorations" Value="Underline"/>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style Selector="SelectableTextBlock">
|
<Style Selector="SelectableTextBlock">
|
||||||
<Setter Property="HorizontalAlignment" Value="Left"/>
|
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||||
|
|
|
@ -106,7 +106,7 @@ namespace SourceGit.Views
|
||||||
return;
|
return;
|
||||||
|
|
||||||
_lastHover = match;
|
_lastHover = match;
|
||||||
_lastHover.Link.Classes.Add("issue_link_hovered");
|
//_lastHover.Link.Classes.Add("issue_link_hovered");
|
||||||
|
|
||||||
SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
|
SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
|
||||||
ToolTip.SetTip(this, match.URL);
|
ToolTip.SetTip(this, match.URL);
|
||||||
|
@ -124,7 +124,6 @@ namespace SourceGit.Views
|
||||||
{
|
{
|
||||||
e.Pointer.Capture(null);
|
e.Pointer.Capture(null);
|
||||||
Native.OS.OpenBrowser(_lastHover.URL);
|
Native.OS.OpenBrowser(_lastHover.URL);
|
||||||
ClearHoveredIssueLink();
|
|
||||||
e.Handled = true;
|
e.Handled = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -144,7 +143,7 @@ namespace SourceGit.Views
|
||||||
{
|
{
|
||||||
ToolTip.SetTip(this, null);
|
ToolTip.SetTip(this, null);
|
||||||
SetCurrentValue(CursorProperty, Cursor.Parse("IBeam"));
|
SetCurrentValue(CursorProperty, Cursor.Parse("IBeam"));
|
||||||
_lastHover.Link.Classes.Remove("issue_link_hovered");
|
//_lastHover.Link.Classes.Remove("issue_link_hovered");
|
||||||
_lastHover = null;
|
_lastHover = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,8 +77,9 @@
|
||||||
FontSize="10"
|
FontSize="10"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
|
|
||||||
<TextBlock Classes="primary"
|
<v:CommitSubjectPresenter Classes="primary"
|
||||||
Text="{Binding Subject}"
|
Subject="{Binding Subject}"
|
||||||
|
IssueTrackerRules="{Binding $parent[v:Histories].IssueTrackerRules}"
|
||||||
Opacity="{Binding Opacity}"
|
Opacity="{Binding Opacity}"
|
||||||
FontWeight="{Binding FontWeight}"/>
|
FontWeight="{Binding FontWeight}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
|
@ -1,13 +1,17 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
|
using Avalonia.Collections;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Controls.Documents;
|
||||||
using Avalonia.Controls.Primitives;
|
using Avalonia.Controls.Primitives;
|
||||||
using Avalonia.Input;
|
using Avalonia.Input;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
using Avalonia.Media;
|
using Avalonia.Media;
|
||||||
using Avalonia.Threading;
|
using Avalonia.Threading;
|
||||||
|
using Avalonia.Utilities;
|
||||||
using Avalonia.VisualTree;
|
using Avalonia.VisualTree;
|
||||||
|
|
||||||
namespace SourceGit.Views
|
namespace SourceGit.Views
|
||||||
|
@ -153,6 +157,146 @@ namespace SourceGit.Views
|
||||||
private Status _status = Status.Normal;
|
private Status _status = Status.Normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class CommitSubjectPresenter : TextBlock
|
||||||
|
{
|
||||||
|
public static readonly StyledProperty<string> SubjectProperty =
|
||||||
|
AvaloniaProperty.Register<CommitSubjectPresenter, string>(nameof(Subject));
|
||||||
|
|
||||||
|
public string Subject
|
||||||
|
{
|
||||||
|
get => GetValue(SubjectProperty);
|
||||||
|
set => SetValue(SubjectProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly StyledProperty<AvaloniaList<Models.IssueTrackerRule>> IssueTrackerRulesProperty =
|
||||||
|
AvaloniaProperty.Register<CommitSubjectPresenter, AvaloniaList<Models.IssueTrackerRule>>(nameof(IssueTrackerRules));
|
||||||
|
|
||||||
|
public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
|
||||||
|
{
|
||||||
|
get => GetValue(IssueTrackerRulesProperty);
|
||||||
|
set => SetValue(IssueTrackerRulesProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override Type StyleKeyOverride => typeof(TextBlock);
|
||||||
|
|
||||||
|
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
|
||||||
|
{
|
||||||
|
base.OnPropertyChanged(change);
|
||||||
|
|
||||||
|
if (change.Property == SubjectProperty || change.Property == IssueTrackerRulesProperty)
|
||||||
|
{
|
||||||
|
Inlines.Clear();
|
||||||
|
_matches = null;
|
||||||
|
ClearHoveredIssueLink();
|
||||||
|
|
||||||
|
var subject = Subject;
|
||||||
|
if (string.IsNullOrEmpty(subject))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var rules = IssueTrackerRules;
|
||||||
|
if (rules == null || rules.Count == 0)
|
||||||
|
{
|
||||||
|
Inlines.Add(new Run(subject));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var matches = new List<Models.IssueTrackerMatch>();
|
||||||
|
foreach (var rule in rules)
|
||||||
|
rule.Matches(matches, subject);
|
||||||
|
|
||||||
|
if (matches.Count == 0)
|
||||||
|
{
|
||||||
|
Inlines.Add(new Run(subject));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
matches.Sort((l, r) => l.Start - r.Start);
|
||||||
|
_matches = matches;
|
||||||
|
|
||||||
|
int pos = 0;
|
||||||
|
foreach (var match in matches)
|
||||||
|
{
|
||||||
|
if (match.Start > pos)
|
||||||
|
Inlines.Add(new Run(subject.Substring(pos, match.Start - pos)));
|
||||||
|
|
||||||
|
match.Link = new Run(subject.Substring(match.Start, match.Length));
|
||||||
|
match.Link.Classes.Add("issue_link");
|
||||||
|
Inlines.Add(match.Link);
|
||||||
|
|
||||||
|
pos = match.Start + match.Length;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pos < subject.Length)
|
||||||
|
Inlines.Add(new Run(subject.Substring(pos)));
|
||||||
|
|
||||||
|
InvalidateTextLayout();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnPointerMoved(PointerEventArgs e)
|
||||||
|
{
|
||||||
|
base.OnPointerMoved(e);
|
||||||
|
|
||||||
|
if (_matches != null)
|
||||||
|
{
|
||||||
|
var padding = Padding;
|
||||||
|
var point = e.GetPosition(this) - new Point(padding.Left, padding.Top);
|
||||||
|
point = new Point(
|
||||||
|
MathUtilities.Clamp(point.X, 0, Math.Max(TextLayout.WidthIncludingTrailingWhitespace, 0)),
|
||||||
|
MathUtilities.Clamp(point.Y, 0, Math.Max(TextLayout.Height, 0)));
|
||||||
|
|
||||||
|
var textPosition = TextLayout.HitTestPoint(point).TextPosition;
|
||||||
|
foreach (var match in _matches)
|
||||||
|
{
|
||||||
|
if (!match.Intersect(textPosition, 1))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (match == _lastHover)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_lastHover = match;
|
||||||
|
//_lastHover.Link.Classes.Add("issue_link_hovered");
|
||||||
|
|
||||||
|
SetCurrentValue(CursorProperty, Cursor.Parse("Hand"));
|
||||||
|
ToolTip.SetTip(this, match.URL);
|
||||||
|
ToolTip.SetIsOpen(this, true);
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ClearHoveredIssueLink();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnPointerPressed(PointerPressedEventArgs e)
|
||||||
|
{
|
||||||
|
base.OnPointerPressed(e);
|
||||||
|
|
||||||
|
if (_lastHover != null)
|
||||||
|
Native.OS.OpenBrowser(_lastHover.URL);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnPointerExited(PointerEventArgs e)
|
||||||
|
{
|
||||||
|
base.OnPointerExited(e);
|
||||||
|
ClearHoveredIssueLink();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ClearHoveredIssueLink()
|
||||||
|
{
|
||||||
|
if (_lastHover != null)
|
||||||
|
{
|
||||||
|
ToolTip.SetTip(this, null);
|
||||||
|
SetCurrentValue(CursorProperty, Cursor.Parse("Arrow"));
|
||||||
|
//_lastHover.Link.Classes.Remove("issue_link_hovered");
|
||||||
|
_lastHover = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<Models.IssueTrackerMatch> _matches = null;
|
||||||
|
private Models.IssueTrackerMatch _lastHover = null;
|
||||||
|
}
|
||||||
|
|
||||||
public class CommitTimeTextBlock : TextBlock
|
public class CommitTimeTextBlock : TextBlock
|
||||||
{
|
{
|
||||||
public static readonly StyledProperty<bool> ShowAsDateTimeProperty =
|
public static readonly StyledProperty<bool> ShowAsDateTimeProperty =
|
||||||
|
@ -451,6 +595,15 @@ namespace SourceGit.Views
|
||||||
set => SetValue(CurrentBranchProperty, value);
|
set => SetValue(CurrentBranchProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static readonly StyledProperty<AvaloniaList<Models.IssueTrackerRule>> IssueTrackerRulesProperty =
|
||||||
|
AvaloniaProperty.Register<Histories, AvaloniaList<Models.IssueTrackerRule>>(nameof(IssueTrackerRules));
|
||||||
|
|
||||||
|
public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
|
||||||
|
{
|
||||||
|
get => GetValue(IssueTrackerRulesProperty);
|
||||||
|
set => SetValue(IssueTrackerRulesProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
public static readonly StyledProperty<long> NavigationIdProperty =
|
public static readonly StyledProperty<long> NavigationIdProperty =
|
||||||
AvaloniaProperty.Register<Histories, long>(nameof(NavigationId));
|
AvaloniaProperty.Register<Histories, long>(nameof(NavigationId));
|
||||||
|
|
||||||
|
|
|
@ -668,7 +668,9 @@
|
||||||
<ContentControl Grid.Row="2" Content="{Binding SelectedView}">
|
<ContentControl Grid.Row="2" Content="{Binding SelectedView}">
|
||||||
<ContentControl.DataTemplates>
|
<ContentControl.DataTemplates>
|
||||||
<DataTemplate DataType="vm:Histories">
|
<DataTemplate DataType="vm:Histories">
|
||||||
<v:Histories CurrentBranch="{Binding Repo.CurrentBranch}" NavigationId="{Binding NavigationId}"/>
|
<v:Histories CurrentBranch="{Binding Repo.CurrentBranch}"
|
||||||
|
IssueTrackerRules="{Binding Repo.Settings.IssueTrackerRules}"
|
||||||
|
NavigationId="{Binding NavigationId}"/>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|
||||||
<DataTemplate DataType="vm:WorkingCopy">
|
<DataTemplate DataType="vm:WorkingCopy">
|
||||||
|
|
Loading…
Reference in a new issue