Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,17 @@
switch (msg)
{
case Win32Helper.WM_ACTIVATE:
var isInactive = ((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE;
if (_model.IsSinglePane)
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane(this, !isInactive);
}
else
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane(this, !isInactive);
var isActive = ((int)wParam & 0xFFFF) != Win32Helper.WA_INACTIVE;
if (isActive)
{
if (_model.IsSinglePane)
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane(this);

Check failure on line 234 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane<T>(T, bool)'

Check failure on line 234 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane<T>(T, bool)'

Check failure on line 234 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane<T>(T, bool)'

Check failure on line 234 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane<T>(T, bool)'
}
else
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane(this);

Check failure on line 238 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane<T>(T, bool)'

Check failure on line 238 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane<T>(T, bool)'

Check failure on line 238 in source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

There is no argument given that corresponds to the required parameter 'isActive' of 'LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane<T>(T, bool)'
}
}

handled = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,17 @@
switch (msg)
{
case Win32Helper.WM_ACTIVATE:
var isInactive = ((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE;
if (_model.IsSinglePane)
var isActive = ((int)wParam & 0xFFFF) != Win32Helper.WA_INACTIVE;
if (isActive)
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane(this, !isInactive);
}
else
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane(this, !isInactive);
if (_model.IsSinglePane)
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfSinglePane(this, true);
}
else
{
LayoutFloatingWindowControlHelper.ActiveTheContentOfMultiPane(this, true);
}
}

handled = true;
Expand Down Expand Up @@ -419,4 +422,4 @@
}
}
}
}
}

Check failure on line 425 in source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

Check failure on line 425 in source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

Check failure on line 425 in source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs

View workflow job for this annotation

GitHub Actions / Build & Test

7 changes: 7 additions & 0 deletions source/TestApp/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@
Foreground="White"
Text="{Binding TestTimer, Mode=OneWay, StringFormat='Document 2 Attached to Timer ->\{0\}'}" />
</LayoutDocument>
<LayoutDocument Title="Document 3" ContentId="document3">
<Button
Margin="25"
VerticalAlignment="Top"
Click="ShowMessageBox_click"
Content="Click to open message box" />
</LayoutDocument>
</LayoutDocumentPane>
</LayoutDocumentPaneGroup>
<LayoutAnchorablePaneGroup DockWidth="50">
Expand Down
2 changes: 2 additions & 0 deletions source/TestApp/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -256,5 +256,7 @@ private void OnNewFloatingWindow(object sender, RoutedEventArgs e)
anchorable.AddToLayout(dockManager,AnchorableShowStrategy.Most);
anchorable.Float();
}

private void ShowMessageBox_click(object sender, RoutedEventArgs e) => MessageBox.Show("Test messge", "Test");
}
}
Loading