Skip to content

Remove the usage of grid in Inheritance margin #64138

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

Merged
Cosifne merged 2 commits into from
Sep 20, 2022
Merged

Remove the usage of grid in Inheritance margin #64138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
629600e
Remove the usage of grid
Cosifne Sep 19, 2022
a66f023
Fix integration test
Cosifne Sep 20, 2022
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
12 changes: 2 additions & 10 deletions src/VisualStudio/Core/Def/InheritanceMargin/InheritanceMarginViewMargin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ internal class InheritanceMarginViewMargin : ForegroundThreadAffinitizedObject,
private readonly IGlobalOptionService _globalOptions;
private readonly InheritanceGlyphManager _glyphManager;
private readonly string _languageName;
private readonly Grid _grid;
private readonly Canvas _mainCanvas;

/// <summary>
Expand Down Expand Up @@ -61,8 +60,6 @@ public InheritanceMarginViewMargin(
_globalOptions = globalOptions;
_languageName = languageName;
_mainCanvas = new Canvas { ClipToBounds = true, Width = HeightAndWidthOfMargin };
_grid = new Grid();
_grid.Children.Add(_mainCanvas);
_glyphManager = new InheritanceGlyphManager(
workspace,
textView,
Expand All @@ -83,10 +80,6 @@ public InheritanceMarginViewMargin(
_textView.ZoomLevelChanged += OnZoomLevelChanged;
_globalOptions.OptionChanged += OnGlobalOptionChanged;

_grid.LayoutTransform = new ScaleTransform(
scaleX: _textView.ZoomLevel / 100,
scaleY: _textView.ZoomLevel / 100);
_grid.LayoutTransform.Freeze();
UpdateMarginVisibility();
}

Expand All @@ -107,7 +100,6 @@ void IDisposable.Dispose()

private void OnZoomLevelChanged(object sender, ZoomLevelChangedEventArgs e)
{
_grid.LayoutTransform = e.ZoomTransform;
_refreshAllGlyphs = true;
}

Expand Down Expand Up @@ -212,7 +204,7 @@ FrameworkElement IWpfTextViewMargin.VisualElement
get
{
ThrowIfDisposed();
return _grid;
return _mainCanvas;
}
}

Expand All @@ -221,7 +213,7 @@ double ITextViewMargin.MarginSize
get
{
ThrowIfDisposed();
return _grid.ActualWidth;
return _mainCanvas.ActualWidth;
}
}

Expand Down
8 changes: 2 additions & 6 deletions ...VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/InheritanceMarginInProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public async Task DisableOptionsAsync(string languageName, CancellationToken can
private async Task EnsureGlyphsAppearAsync(Func<CancellationToken, Task> makeChangeFunc, int expectedGlyphsNumberInMargin, CancellationToken cancellationToken)
{
var margin = await GetTextViewMarginAsync(cancellationToken);
var marginCanvas = (Canvas)((Grid)margin.VisualElement).Children[0];
var marginCanvas = (Canvas)margin.VisualElement;
var taskCompletionSource = new TaskCompletionSource<bool>();
using var _ = cancellationToken.Register(() => taskCompletionSource.TrySetCanceled());

Expand Down Expand Up @@ -116,11 +116,7 @@ public async Task<InheritanceMarginGlyph> GetTheGlyphOnLineAsync(int lineNumber,
var wpfTextViewLine = activeView.TextViewLines[lineNumber - 1];
var midOfTheLine = wpfTextViewLine.TextTop + wpfTextViewLine.Height / 2;
var margin = await GetTextViewMarginAsync(cancellationToken);

var grid = (Grid)margin.VisualElement;
// There will be only one Canvas element.
Assert.True(grid.Children.Count == 1);
var containingCanvas = (Canvas)((Grid)margin.VisualElement).Children[0];
var containingCanvas = (Canvas)margin.VisualElement;

var glyphsOnLine = new List<InheritanceMarginGlyph>();
foreach (var glyph in containingCanvas.Children)
Expand Down