Skip to content
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

Fix reopening of Floating windows after they were closed from Unload … #51

Merged
merged 1 commit into from
Jul 17, 2019
Merged

Fix reopening of Floating windows after they were closed from Unload … #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,9 @@ protected virtual IntPtr FilterMessage( IntPtr hwnd, int msg, IntPtr wParam, Int
return IntPtr.Zero;
}

internal void InternalClose()
internal void InternalClose(bool closeInitiatedByUser = false)
{
_internalCloseFlag = true;
_internalCloseFlag = !closeInitiatedByUser;
if( !_isClosing )
{
_isClosing = true;
Expand Down
2 changes: 1 addition & 1 deletion source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2425,7 +2425,7 @@ private void DockingManager_Unloaded( object sender, RoutedEventArgs e )
fw.SetParentWindowToNull();
fw.KeepContentVisibleOnClose = true;
// To avoid calling Close method multiple times.
fw.InternalClose();
fw.InternalClose(true);
}
_fwList.Clear();

Expand Down