Skip to content

Improve visual parent retrieval in ActionMessage #1020

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

Open
vb2ae wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Improve visual parent retrieval in ActionMessage #1020

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc61693
Improve visual parent retrieval in ActionMessage
vb2ae Oct 20, 2025
1b7032a
Fix typo in conditional statement for PopupRoot
vb2ae Oct 20, 2025
95d64ce
Refactor Popup handling across UI frameworks
vb2ae Oct 22, 2025
faee39c
Improve visual parent retrieval in ActionMessage
vb2ae Oct 20, 2025
6ca2991
Fix typo in conditional statement for PopupRoot
vb2ae Oct 20, 2025
ee39133
Refactor Popup handling across UI frameworks
vb2ae Oct 22, 2025
ea4995b
Refactor popup handling logic
vb2ae Oct 22, 2025
4eb6e27
Enhance project configuration and popup handling
vb2ae Oct 22, 2025
e0101fb
Refactor popup handling and add Avalonia logging
vb2ae Oct 22, 2025
cc8aad2
Merge branch 'master' into Issue-1016
vb2ae Oct 22, 2025
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
19 changes: 18 additions & 1 deletion src/Caliburn.Micro.Platform/ActionMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using Microsoft.Xaml.Interactivity;
using TriggerBase = Microsoft.Xaml.Interactivity.IBehavior;
using EventTrigger = Microsoft.Xaml.Interactions.Core.EventTriggerBehavior;
using popupUI = Windows.UI.Xaml.Controls.Primitives;
#elif AVALONIA
using Avalonia;
using Avalonia.Data;
Expand All @@ -30,6 +31,7 @@
using EventTrigger = Avalonia.Xaml.Interactions.Core.EventTriggerBehavior;
using FrameworkElement = Avalonia.Controls.Control;
using Avalonia.Input;
using popupUI = Avalonia.Controls.Primitives;
#elif WinUI3
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data;
Expand All @@ -40,13 +42,15 @@
using Microsoft.Xaml.Interactivity;
using TriggerBase = Microsoft.Xaml.Interactivity.IBehavior;
using EventTrigger = Microsoft.Xaml.Interactions.Core.EventTriggerBehavior;
using popupUI = Microsoft.UI.Xaml.Controls.Primitives;
#else
using System.Windows;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Markup;
using Microsoft.Xaml.Behaviors;
using EventTrigger = Microsoft.Xaml.Behaviors.EventTrigger;
using popupUI = System.Windows.Controls.Primitives;
#endif

#if NET5_0_WINDOWS || NET6_0_WINDOWS
Expand Down Expand Up @@ -597,7 +601,20 @@
}
}

currentElement = BindingScope.GetVisualParent(currentElement);
var pElement = BindingScope.GetVisualParent(currentElement);
if (pElement != null && currentElement.GetType().Name.Equals("PopupRoot", StringComparison.OrdinalIgnoreCase))
{
if (currentElement is popupUI.Popup popupRoot && popupRoot.Parent is popupUI.Popup popup)
{
#if WINDOWS_UWP
pElement = popup.Parent;
#else
pElement = popup.PlacementTarget;
#endif
}
}
currentElement = pElement;

}
#if AVALONIA
Log.Info("SetMethodBinding avalonia");
Expand Down
Loading