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 floating windows still created twice #427

Merged
merged 1 commit into from
Mar 24, 2023
+4 −5
Merged

Fix floating windows still created twice #427

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
9 changes: 4 additions & 5 deletions source/Components/AvalonDock/DockingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ public double GridSplitterHeight
new FrameworkPropertyMetadata((Style)null));

/// <summary>
/// Gets or sets the GridSplitterVerticalStyle property. This dependency property
/// Gets or sets the GridSplitterVerticalStyle property. This dependency property
/// indicates the style to apply to the LayoutGridResizerControl when displayed vertically.
/// </summary>
public Style GridSplitterVerticalStyle
Expand All @@ -1164,7 +1164,7 @@ public Style GridSplitterVerticalStyle
new FrameworkPropertyMetadata((Style)null));

/// <summary>
/// Gets or sets the GridSplitterHorizontalStyle property. This dependency property
/// Gets or sets the GridSplitterHorizontalStyle property. This dependency property
/// indicates the style to apply to the LayoutGridResizerControl when displayed horizontally.
/// </summary>
public Style GridSplitterHorizontalStyle
Expand Down Expand Up @@ -2125,9 +2125,8 @@ private void DockingManager_Loaded(object sender, RoutedEventArgs e)
}
_fwHiddenList.Clear();

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

//create the overlaywindow if it's possible
Expand Down