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

Enum invalid operation exception #86

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 2 commits into from
Oct 29, 2019
Merged

Enum invalid operation exception #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82c2a62
BugFix Candidate for
Dirkster99 Sep 27, 2019
5746161
Merge remote-tracking branch 'origin/master' into EnumInvalidOperatio…
Dirkster99 Oct 29, 2019
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
11 changes: 7 additions & 4 deletions source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2403,9 +2403,10 @@ private void DockingManager_Loaded( object sender, RoutedEventArgs e )
}
_fwHiddenList.Clear();

//load windows not already loaded!
foreach( var fw in Layout.FloatingWindows.Where( fw => !_fwList.Any( fwc => fwc.Model == fw ) ) )
_fwList.Add( CreateUIElementForModel( fw ) as LayoutFloatingWindowControl );
// load floating windows not already loaded! (issue #59)
List<LayoutFloatingWindow> items = new List<LayoutFloatingWindow>(Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)));
foreach (var fw in items)
_fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);

//create the overlaywindow if it's possible
if( IsVisible )
Expand Down Expand Up @@ -2980,7 +2981,9 @@ private void RemoveViewFromLogicalChild( LayoutContent layoutContent )

private void InternalSetActiveContent( object contentObject )
{
var layoutContent = Layout.Descendents().OfType<LayoutContent>().FirstOrDefault( lc => lc == contentObject || lc.Content == contentObject );
// BugFix for first issue in #59
List<LayoutContent> list = Layout.Descendents().OfType<LayoutContent>().ToList();
var layoutContent = list.FirstOrDefault( lc => lc == contentObject || lc.Content == contentObject );
_insideInternalSetActiveContent = true;
Layout.ActiveContent = layoutContent;
_insideInternalSetActiveContent = false;
Expand Down