Skip to content

#511 Fix Nullref in LayoutDocumentTabItem.OnMouseLeftButtonDown #512

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#511 Fix Nullref in LayoutDocumentTabItem.OnMouseLeftButtonDown #512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40d38d5
#511 Fix Nullref in LayoutDocumentTabItem.OnMouseLeftButtonDown
sharpSteff Oct 24, 2025
0d2e9ba
revert other formating
sharpSteff Oct 24, 2025
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: 12 additions & 4 deletions source/Components/AvalonDock/Controls/LayoutDocumentTabItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,16 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
base.OnMouseLeftButtonDown(e);
CaptureMouse();
_allowDrag = false;
Model.IsActive = true;
if (Model is LayoutDocument layoutDocument && !layoutDocument.CanMove) return;
if (Model != null)
{
Model.IsActive = true;
}

if (Model is LayoutDocument layoutDocument && !layoutDocument.CanMove)
{
return;
}

if (e.ClickCount != 1) return;
_mouseDownPoint = e.GetPosition(this);
_isMouseDown = true;
Expand Down Expand Up @@ -147,10 +155,10 @@ protected override void OnMouseMove(MouseEventArgs e)
var containerPane = Model.Parent as ILayoutPane;

if (containerPane is LayoutDocumentPane layoutDocumentPane && !layoutDocumentPane.CanRepositionItems) return;
if (containerPane.Parent is LayoutDocumentPaneGroup layoutDocumentPaneGroup && !layoutDocumentPaneGroup.CanRepositionItems) return;
if (containerPane?.Parent is LayoutDocumentPaneGroup layoutDocumentPaneGroup && !layoutDocumentPaneGroup.CanRepositionItems) return;

var childrenList = container.Children.ToList();
containerPane.MoveChild(childrenList.IndexOf(Model), childrenList.IndexOf(targetModel));
containerPane?.MoveChild(childrenList.IndexOf(Model), childrenList.IndexOf(targetModel));
Model.IsActive = true;
_parentDocumentTabPanel.UpdateLayout();
UpdateDragDetails();
Expand Down