Исправление ошибки слияния
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Pf2eViewer.EntityTreeViewer;
|
using Pf2eViewer.EntityTreeViewer;
|
||||||
|
|
||||||
namespace Pf2eViewer.EntityTreeViewer;
|
namespace Pf2eViewer.EntityTreeViewer;
|
||||||
|
|
||||||
public sealed partial class EntityTreeViewerControl : UserControl
|
public sealed partial class EntityTreeViewerControl : UserControl
|
||||||
public partial class EntityTreeViewerControl : UserControl
|
|
||||||
{
|
{
|
||||||
private int _itemHeight = 20;
|
private int _itemHeight = 20;
|
||||||
|
|
||||||
@@ -90,7 +90,6 @@ public partial class EntityTreeViewerControl : UserControl
|
|||||||
|
|
||||||
ContentPanel.Controls.Clear();
|
ContentPanel.Controls.Clear();
|
||||||
ContentPanel.Controls.AddRange(_viewerRows.ToArray<Control>());
|
ContentPanel.Controls.AddRange(_viewerRows.ToArray<Control>());
|
||||||
ContentPanel.Controls.AddRange(ViewerRows.ToArray());
|
|
||||||
|
|
||||||
UpdateView();
|
UpdateView();
|
||||||
}
|
}
|
||||||
@@ -125,6 +124,7 @@ public partial class EntityTreeViewerControl : UserControl
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void BuildLadder(List<EntityTreeViewerRow> rows)
|
private void BuildLadder(List<EntityTreeViewerRow> rows)
|
||||||
|
{
|
||||||
List<LadderType> lastLadder = [];
|
List<LadderType> lastLadder = [];
|
||||||
ContentPanel.VerticalScroll.Visible = true;
|
ContentPanel.VerticalScroll.Visible = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user