Skip to content

fix: center diff change indicators and fix width calculation #2275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gotoh wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −3
Open

fix: center diff change indicators and fix width calculation #2275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/Views/TextDiffView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ public override void Render(DrawingContext context)
}

if (indicator != null)
context.DrawText(indicator, new Point(0, y - (indicator.Height * 0.5)));
{
var x = (Bounds.Width - indicator.Width) * 0.5;
context.DrawText(indicator, new Point(x, y - (indicator.Height * 0.5)));
}
}
}
}
Expand All @@ -167,14 +170,21 @@ protected override Size MeasureOverride(Size availableSize)
return new Size(0, 0);

var typeface = TextView.CreateTypeface();
var test = new FormattedText(
var minus = new FormattedText(
"-",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.White);
return new Size(test.Width, 0);
var plus = new FormattedText(
"+",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
presenter.FontSize,
Brushes.White);
return new Size(Math.Max(minus.Width, plus.Width), 0);
}

protected override void OnDataContextChanged(EventArgs e)
Expand Down