这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix Visibility issue on closing LayoutFloatingWindowControl #44

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
merged 1 commit into from
Jun 20, 2019
Merged

Fix Visibility issue on closing LayoutFloatingWindowControl #44

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
15 changes: 15 additions & 0 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 @@ -15,6 +15,7 @@ This program is provided to you under the terms of the Microsoft Public
***********************************************************************************/

using System;
using System.ComponentModel;
using System.Linq;
using System.Windows;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -58,6 +59,7 @@ protected LayoutFloatingWindowControl( ILayoutElement model )
{
this.Loaded += new RoutedEventHandler( OnLoaded );
this.Unloaded += new RoutedEventHandler( OnUnloaded );
Closing += OnClosing;
_model = model;
}

Expand Down Expand Up @@ -453,6 +455,19 @@ private void OnUnloaded( object sender, RoutedEventArgs e )
}
}

private void OnClosing(object sender, CancelEventArgs e)
{
Closing -= OnClosing;

// If this window was Closed not from InternalClose method,
// mark it as closing to avoid "InvalidOperationException: : Cannot set Visibility to Visible or call Show, ShowDialog,
// Close, or WindowInteropHelper.EnsureHandle while a Window is closing".
if (!_isClosing)
{
_isClosing = true;
}
}

private void OnActivated( object sender, EventArgs e )
{
this.Activated -= new EventHandler( OnActivated );
Expand Down