Skip to content

Commit f4e1e0f

Browse files
committed
fix: use TextTrimming alternative PathConverters
1 parent f7dd856 commit f4e1e0f

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/ViewModels/DiffContext.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Threading.Tasks;
44

55
using Avalonia;
6+
using Avalonia.Media;
67
using Avalonia.Media.Imaging;
78
using Avalonia.Threading;
89

@@ -73,6 +74,11 @@ public Models.FileModeDiff FileModeDiff
7374
set => SetProperty(ref _fileModeDiff, value);
7475
}
7576

77+
public TextTrimming PathTrimming
78+
{
79+
get => _pathTrimming;
80+
}
81+
7682
public DiffContext(string repo, Models.DiffOption option, DiffContext previous = null)
7783
{
7884
_repo = repo;
@@ -193,5 +199,6 @@ private Bitmap BitmapFromRevisionFile(string repo, string revision, string file)
193199
private object _content = null;
194200
private Vector _syncScrollOffset = Vector.Zero;
195201
private Models.FileModeDiff _fileModeDiff = null;
202+
private TextTrimming _pathTrimming = new TextLeadingPrefixTrimming("...", 20);
196203
}
197204
}

src/Views/DiffView.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
<DockPanel Grid.Column="1" VerticalAlignment="Center">
2424
<Path DockPanel.Dock="Left" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
25-
<TextBlock Classes="monospace" Margin="4,0,0,0" Text="{Binding FilePath, Converter={x:Static c:PathConverters.TruncateIfTooLong}}"
26-
TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" HorizontalAlignment="Stretch" ToolTip.Tip="{Binding FilePath}" FontSize="11"/>
25+
<TextBlock Classes="monospace" Margin="4,0,0,0" Text="{Binding FilePath}"
26+
TextTrimming="{Binding PathTrimming}" TextWrapping="NoWrap" HorizontalAlignment="Stretch" ToolTip.Tip="{Binding FilePath}" FontSize="11"/>
2727
<Path DockPanel.Dock="Right" Classes="rotating" Width="10" Height="10" Margin="8,0" Data="{StaticResource Icons.Loading}" IsVisible="{Binding IsLoading}"/>
2828
</DockPanel>
2929

0 commit comments

Comments
 (0)