Skip to content

[BUG] Fix Expander in Popup bug #422

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
mou-haz wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[BUG] Fix Expander in Popup bug #422

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4dddcd5
fix expander in popup bug
mou-haz Jan 26, 2026
5671c3b
Merge branch 'ExpanderInPopupBug' of https://github.com/mou-haz/UI.WP…
mou-haz Jan 26, 2026
6b5459b
not necessary
mou-haz Jan 26, 2026
09a4da7
remove cached
mou-haz Feb 2, 2026
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: 11 additions & 4 deletions source/iNKORE.UI.WPF.Modern/Controls/Helpers/ExpanderAnimationsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.ComponentModel;
using System.Windows.Controls;
using System.Windows;
using System.Windows.Media;
Expand All @@ -17,11 +16,13 @@ public static string GetToAnimateControlName(Expander element) =>
public static void SetToAnimateControlName(Expander element, string value) =>
element.SetValue(ToAnimateControlNameProperty, value);

private const string DefaultAnimationTargetPartName = "ExpanderContent";

public static readonly DependencyProperty ToAnimateControlNameProperty = DependencyProperty.RegisterAttached(
"ToAnimateControlName",
typeof(string),
typeof(ExpanderAnimationsHelper),
new PropertyMetadata("ExpanderContent"));
new PropertyMetadata(DefaultAnimationTargetPartName));

#endregion

Expand Down Expand Up @@ -176,6 +177,8 @@ private static void AnimateExpand(Expander expander)
{
var toAnimateControl = GetToAnimateControl(expander);
toAnimateControl.BeginAnimation(UIElement.VisibilityProperty, null);
toAnimateControl.Visibility = Visibility.Visible;

UpdateLayout(toAnimateControl);

if (toAnimateControl.RenderTransform is not TranslateTransform translateTransform)
Expand Down Expand Up @@ -270,7 +273,11 @@ private static void UpdateLayout(FrameworkElement contentControl)
contentControl.UpdateLayout();
}

private static FrameworkElement GetToAnimateControl(Expander expander) =>
expander.Template?.FindName(GetToAnimateControlName(expander), expander) as FrameworkElement;
private static FrameworkElement GetToAnimateControl(Expander expander)
{
expander.ApplyTemplate();
return expander.Template?.FindName(GetToAnimateControlName(expander), expander) as FrameworkElement ??
throw new InvalidOperationException($"Couldn't find the part to animate. Either update ExpanderAnimationsHelper.ToAnimateControlName, or rename the animation target part to the default: {DefaultAnimationTargetPartName}");
}
}
}
Loading