Skip to content

Respect IsCollapsable in proportional cleanup #998

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
wieslawsoltes merged 2 commits into from
Jan 22, 2026
Merged

Respect IsCollapsable in proportional cleanup #998

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
b0de71d
Respect IsCollapsable in proportional cleanup
wieslawsoltes Jan 22, 2026
9a7d101
Add regression test for non-collapsable cleanup
wieslawsoltes Jan 22, 2026
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
2 changes: 2 additions & 0 deletions src/Dock.Model/FactoryBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ private void CleanupProportionalDockTree(IProportionalDock dock)
{
if (dock.VisibleDockables == null || dock.Owner is not IDock owner || dock.Owner is IRootDock)
return;
if (!dock.IsCollapsable)
return;

// Check if this dock has only one visible dockable
if (dock.VisibleDockables.Count == 1)
Expand Down
45 changes: 45 additions & 0 deletions tests/Dock.Avalonia.HeadlessTests/FactorySplitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,51 @@ public void CollapseDock_WithSingleDockable_CleansUpProportionalDockTree()
Assert.Empty(root.VisibleDockables!);
}

[AvaloniaFact]
public void CollapseDock_DoesNotSimplify_NonCollapsable_ProportionalDock()
{
var factory = new Factory();

var containerDock = new ProportionalDock
{
Orientation = Orientation.Horizontal,
VisibleDockables = factory.CreateList<IDockable>()
};

var mainArea = new ProportionalDock
{
Orientation = Orientation.Vertical,
IsCollapsable = false,
VisibleDockables = factory.CreateList<IDockable>()
};

var documentDock = new DocumentDock
{
VisibleDockables = factory.CreateList<IDockable>()
};

var splitter = new ProportionalDockSplitter();

var bottomPane = new ProportionalDock
{
Orientation = Orientation.Vertical,
VisibleDockables = factory.CreateList<IDockable>()
};

factory.AddDockable(containerDock, mainArea);
factory.AddDockable(mainArea, documentDock);
factory.AddDockable(mainArea, splitter);
factory.AddDockable(mainArea, bottomPane);

factory.CollapseDock(bottomPane);

Assert.Single(containerDock.VisibleDockables!);
Assert.Same(mainArea, containerDock.VisibleDockables[0]);
Assert.Single(mainArea.VisibleDockables!);
Assert.Same(documentDock, mainArea.VisibleDockables[0]);
Assert.Same(mainArea, documentDock.Owner);
}

[AvaloniaFact]
public void CollapseDock_WithSingleDockable_StopsCleanupAtRootDock()
{
Expand Down