Skip to content

Commit 582a283

Browse files
committed
feature: show image size change for Models.ImageDiff
1 parent 2234674 commit 582a283

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

src/SourceGit/Models/DiffResult.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,9 @@ public class ImageDiff
553553
{
554554
public Bitmap Old { get; set; } = null;
555555
public Bitmap New { get; set; } = null;
556+
557+
public string OldSize => Old != null ? $"{Old.PixelSize.Width} x {Old.PixelSize.Height}" : "0 x 0";
558+
public string NewSize => New != null ? $"{New.PixelSize.Width} x {New.PixelSize.Height}" : "0 x 0";
556559
}
557560

558561
public class NoOrEOLChange

src/SourceGit/Views/DiffView.axaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,28 @@
111111

112112
<!-- Image Diff -->
113113
<DataTemplate DataType="m:ImageDiff">
114-
<Grid Margin="8,8,8,8" RowDefinitions="*,Auto" HorizontalAlignment="Center">
115-
<Border Grid.Row="0" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}">
114+
<Grid Margin="8,8,8,8" RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center">
115+
<Grid Grid.Row="0" Margin="0,0,0,8" ColumnDefinitions="Auto,Auto,*,Auto,Auto">
116+
<Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
117+
<TextBlock Classes="monospace" Text="{DynamicResource Text.Diff.Binary.Old}" Margin="8,0" FontSize="10"/>
118+
</Border>
119+
120+
<TextBlock Grid.Column="1" Classes="monospace" Text="{Binding OldSize}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
121+
122+
<Border Grid.Column="3" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" Margin="32,0,0,0">
123+
<TextBlock Classes="monospace" Text="{DynamicResource Text.Diff.Binary.New}" Margin="8,0" FontSize="10"/>
124+
</Border>
125+
126+
<TextBlock Grid.Column="4" Classes="monospace" Text="{Binding NewSize}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
127+
</Grid>
128+
129+
<Border Grid.Row="1" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}">
116130
<v:ImageDiffView Alpha="{Binding #ImageDiffSlider.Value}"
117131
OldImage="{Binding Old}"
118132
NewImage="{Binding New}"/>
119133
</Border>
120134

121-
<Slider Grid.Row="1"
135+
<Slider Grid.Row="2"
122136
x:Name="ImageDiffSlider"
123137
Minimum="0" Maximum="1"
124138
VerticalAlignment="Top"

0 commit comments

Comments
 (0)