dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-31 00:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature<CommitGraph>: add polyline display mode

Browse source
This commit is contained in:
leo 2021-05-19 16:14:46 +08:00
parent e1ca1224dc
commit e6182f9818
9 changed files with 112 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/Views/Controls/CommitGraph.cs
View file

@ -235,12 +235,30 @@ namespace SourceGit.Views.Controls {
protected override void OnRender(DrawingContext dc) {
if (data == null) return;
dc.PushTransform(new TranslateTransform(0, -startY));
// 计算边界
var top = startY;
var bottom = startY + ActualHeight;
dc.PushTransform(new TranslateTransform(0, -startY));
// 绘制线
if (Models.Preference.Instance.Window.UsePolylineInGraph) {
DrawPolyLine(dc, top, bottom);
} else {
DrawCurveLine(dc, top, bottom);
}
// 绘制曲线
// 绘制点
var dotFill = FindResource("Brush.Contents") as Brush;
foreach (var dot in data.Dots) {
if (dot.Center.Y < top) continue;
if (dot.Center.Y > bottom) break;
dc.DrawEllipse(dotFill, PENS[dot.Color], dot.Center, 3, 3);
}
}
private void DrawCurveLine(DrawingContext dc, double top, double bottom) {
foreach (var line in data.Lines) {
var last = line.Points[0];
var size = line.Points.Count;
@ -265,8 +283,6 @@ namespace SourceGit.Views.Controls {
ctx.QuadraticBezierTo(new Point(cur.X, last.Y), cur, true, false);
} else if (cur.X < last.X) {
if (i < size - 1) {
cur.Y += HALF_HEIGHT;
var midY = (last.Y + cur.Y) / 2;
var midX = (last.X + cur.X) / 2;
ctx.PolyQuadraticBezierTo(new Point[] {
@ -290,7 +306,6 @@ namespace SourceGit.Views.Controls {
dc.DrawGeometry(null, pen, geo);
}
// 绘制合并线
foreach (var link in data.Links) {
if (link.End.Y < top) continue;
if (link.Start.Y > bottom) break;
@ -304,14 +319,43 @@ namespace SourceGit.Views.Controls {
geo.Freeze();
dc.DrawGeometry(null, PENS[link.Color], geo);
}
}
// 绘制点
var dotFill = FindResource("Brush.Contents") as Brush;
foreach (var dot in data.Dots) {
if (dot.Center.Y < top) continue;
if (dot.Center.Y > bottom) break;
private void DrawPolyLine(DrawingContext dc, double top, double bottom) {
foreach (var line in data.Lines) {
var last = line.Points[0];
var size = line.Points.Count;
dc.DrawEllipse(dotFill, PENS[dot.Color], dot.Center, 3, 3);
if (line.Points[size - 1].Y < top) continue;
if (last.Y > bottom) continue;
var geo = new StreamGeometry();
var pen = PENS[line.Color];
using (var ctx = geo.Open()) {
ctx.BeginFigure(last, false, false);
var ended = false;
for (int i = 1; i < size; i++) {
var cur = line.Points[i];
if (cur.Y > bottom) {
cur.Y = bottom;
ended = true;
}
ctx.LineTo(cur, true, false);
if (ended) break;
last = cur;
}
}
geo.Freeze();
dc.DrawGeometry(null, pen, geo);
}
foreach (var link in data.Links) {
if (link.End.Y < top) continue;
if (link.Start.Y > bottom) break;
dc.DrawLine(PENS[link.Color], link.Start, link.End);
}
}
}

9
src/Views/Widgets/Histories.xaml
View file

@ -180,10 +180,19 @@
<!-- Right Top Button -->
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,6,0,0" Orientation="Horizontal">
<ToggleButton
Style="{StaticResource Style.ToggleButton.CommitGraphMode}"
Foreground="{StaticResource Brush.FG2}"
Width="16" Height="16"
ToolTip="{StaticResource Text.Histories.GraphMode}"
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.UsePolylineInGraph, Mode=TwoWay}"
Checked="ChangeGraphMode" Unchecked="ChangeGraphMode"/>
<ToggleButton
Style="{StaticResource Style.ToggleButton.SplitDirection}"
Foreground="{StaticResource Brush.FG2}"
Width="16" Height="16"
Margin="8,0,0,0"
ToolTip="{StaticResource Text.Histories.DisplayMode}"
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=Window.MoveCommitInfoRight, Mode=TwoWay, Converter={StaticResource InverseBool}}"
Checked="ChangeOrientation" Unchecked="ChangeOrientation"/>

5
src/Views/Widgets/Histories.xaml.cs
View file

@ -143,6 +143,11 @@ namespace SourceGit.Views.Widgets {
layout.InvalidateArrange();
}
public void ChangeGraphMode(object sender, RoutedEventArgs e) {
graph.InvalidateVisual();
e.Handled = true;
}
#endregion
#region SEARCH_BAR

4
src/Views/Widgets/RevisionCompare.xaml
View file

@ -15,11 +15,11 @@
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="64"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="48"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="64"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<Border