Skip to content

Fix proportional dock save and restore #1093

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
Apr 24, 2026
Merged

Fix proportional dock save and restore #1093

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
932e525
Fix proportional dock save and restore
danwalmsley Apr 24, 2026
5d5291f
Merge branch 'master' into fix/proportional-save-restore
wieslawsoltes Apr 24, 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
4 changes: 3 additions & 1 deletion src/Dock.Avalonia.Themes.Fluent/Controls/ProportionalDockControl.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
Classes="ProportionalStackPanel">
<ItemsControl.Styles>
<Style Selector="ItemsControl.ProportionalStackPanel > ContentPresenter">
<Setter Property="(ProportionalStackPanel.Proportion)"
Value="{Binding Proportion, Mode=TwoWay}" />
<Setter Property="(ProportionalStackPanel.CollapsedProportion)"
Value="{Binding CollapsedProportion}" />
Value="{Binding CollapsedProportion, Mode=TwoWay}" />
<Setter Property="(ProportionalStackPanel.IsCollapsed)">
<Setter.Value>
<MultiBinding Converter="{x:Static BoolConverters.And}">
Expand Down
33 changes: 0 additions & 33 deletions src/Dock.Avalonia/Controls/ProportionalDockControl.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
using Avalonia.Controls;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Data;
using Dock.Controls.ProportionalStackPanel;
using Dock.Model.Core;

namespace Dock.Avalonia.Controls;

Expand All @@ -16,34 +13,4 @@ namespace Dock.Avalonia.Controls;
[TemplatePart("PART_ItemsControl", typeof(ItemsControl), IsRequired = true)]
public class ProportionalDockControl : TemplatedControl
{
private ItemsControl? _itemsControl;

/// <inheritdoc />
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
// Unsubscribe from the previous ItemsControl if it exists
if (_itemsControl != null)
{
_itemsControl.ContainerPrepared -= ItemsControlOnContainerPrepared;
_itemsControl = null;
}

base.OnApplyTemplate(e);

var itemsControl = e.NameScope.Find<ItemsControl>("PART_ItemsControl");

if (itemsControl != null)
{
_itemsControl = itemsControl;
_itemsControl.ContainerPrepared += ItemsControlOnContainerPrepared;
}
}

private void ItemsControlOnContainerPrepared(object? sender, ContainerPreparedEventArgs e)
{
if (e.Container.DataContext is IDockable)
{
e.Container[!ProportionalStackPanel.ProportionProperty] = new Binding(nameof(IDockable.Proportion));
}
}
}
Loading