Skip to content

fix(drawerhost): make overlay close instantly when transitions are disabled #4110

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
MDIX-SA merged 1 commit into from
Oct 17, 2026
+16 −5
Merged

fix(drawerhost): make overlay close instantly when transitions are disabled #4110

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/MainDemo.Wpf/Drawers.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
<TextBlock VerticalAlignment="Center" Text="Primary Overlay Background" />
</StackPanel>

<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
<TextBlock VerticalAlignment="Center" Text="materialDesign:TransitionAssist.DisableTransitions" />
<ToggleButton x:Name="TransitionToggle" Margin="8,0,0,0" />
</StackPanel>

<StackPanel Margin="0,8,0,0" Orientation="Horizontal">
<TextBlock VerticalAlignment="Center" Text="Open Mode" />
<ComboBox SelectedValue="{Binding OpenMode, ElementName=DrawerHost}" SelectedValuePath="Content">
Expand Down Expand Up @@ -57,6 +62,7 @@
Width="480"
Height="480"
Margin="32"
materialDesign:TransitionAssist.DisableTransitions="{Binding ElementName=TransitionToggle, Path=IsChecked}"
ApplyBlurBackground="{Binding ElementName=cbApplyBlurBackground, Path=IsChecked}"
BlurRadius="{Binding ElementName=BlurRadiusSlider, Path=Value}"
HorizontalAlignment="Center"
Expand Down
6 changes: 6 additions & 0 deletions src/MaterialDesign3.Demo.Wpf/Drawers.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@

<TextBlock VerticalAlignment="Center" Text="Primary Overlay Background" />

<StackPanel Orientation="Horizontal" Margin="30,0,0,0">
<TextBlock VerticalAlignment="Center" Text="materialDesign:TransitionAssist.DisableTransitions" />
<ToggleButton x:Name="TransitionToggle" Margin="8,0,0,0" />
</StackPanel>

<TextBlock Margin="30,0,16,0"
VerticalAlignment="Center"
Text="Open Mode" />
Expand All @@ -35,6 +40,7 @@
Width="480"
Height="480"
Margin="32"
materialDesign:TransitionAssist.DisableTransitions="{Binding ElementName=TransitionToggle, Path=IsChecked}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
BorderBrush="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
Expand Down
6 changes: 2 additions & 4 deletions src/MaterialDesignThemes.Wpf/DrawerHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,7 @@ protected void OnDrawerClosing(DrawerClosingEventArgs eventArgs)

public override void OnApplyTemplate()
{
if (_templateContentCoverElement != null)
_templateContentCoverElement.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
_templateContentCoverElement?.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
WireDrawer(_leftDrawerElement, true);
WireDrawer(_topDrawerElement, true);
WireDrawer(_rightDrawerElement, true);
Expand All @@ -537,8 +536,7 @@ public override void OnApplyTemplate()
base.OnApplyTemplate();

_templateContentCoverElement = GetTemplateChild(TemplateContentCoverPartName) as FrameworkElement;
if (_templateContentCoverElement != null)
_templateContentCoverElement.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
_templateContentCoverElement?.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
_leftDrawerElement = WireDrawer(GetTemplateChild(TemplateLeftDrawerPartName) as FrameworkElement, false);
_topDrawerElement = WireDrawer(GetTemplateChild(TemplateTopDrawerPartName) as FrameworkElement, false);
_rightDrawerElement = WireDrawer(GetTemplateChild(TemplateRightDrawerPartName) as FrameworkElement, false);
Expand Down
3 changes: 2 additions & 1 deletion src/MaterialDesignThemes.Wpf/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,8 @@
<Storyboard>
<DoubleAnimation Storyboard.TargetName="PART_ContentCover"
Storyboard.TargetProperty="Opacity"
To="0" />
To="0"
Duration="0" />
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCover" Storyboard.TargetProperty="IsHitTestVisible">
<DiscreteBooleanKeyFrame Value="False" />
</BooleanAnimationUsingKeyFrames>
Expand Down
Loading