Skip to content

Add support for various properties to PopupBox #4011

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
corvinsz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for various properties to PopupBox #4011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b5e9e2
fix(popupbox): add support for Background, BorderBrush, BorderThickne…
corvinsz Feb 20, 2026
9151a65
test(popupbox): get border by unique name
corvinsz Feb 24, 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
42 changes: 34 additions & 8 deletions src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,40 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToggleButton">
<wpf:Ripple Padding="{TemplateBinding Padding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
Focusable="False"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Grid>
<Border x:Name="border"
Background="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=Background}"
BorderBrush="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=BorderBrush}"
BorderThickness="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=BorderThickness}"
CornerRadius="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=(wpf:ButtonAssist.CornerRadius)}" />

<wpf:Ripple Padding="{TemplateBinding Padding}"
ClipToBounds="True"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
Focusable="False"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
<wpf:Ripple.Clip>
<MultiBinding Converter="{x:Static converters:BorderClipConverter.Instance}">
<Binding ElementName="border" Path="ActualWidth" />
<Binding ElementName="border" Path="ActualHeight" />
<Binding ElementName="border" Path="CornerRadius" />
<Binding ElementName="border" Path="BorderThickness" />
</MultiBinding>
</wpf:Ripple.Clip>
</wpf:Ripple>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="border" Property="Background" Value="{Binding Foreground, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={x:Static converters:BrushOpacityConverter.Instance}, ConverterParameter=0.16}" />
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" Value="0.38" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand Down
4 changes: 2 additions & 2 deletions tests/MaterialDesignThemes.UITests/Samples/PopupBox/PopupBoxWithTemplateSelector.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<DataTemplate x:Key="OddTemplate">
<Border Background="Red" Width="10" Height="10" />
<Border x:Name="ContentBorder" Background="Red" Width="10" Height="10" />
</DataTemplate>

<DataTemplate x:Key="EvenTemplate">
<Border Background="Blue" Width="10" Height="10" />
<Border x:Name="ContentBorder" Background="Blue" Width="10" Height="10" />
</DataTemplate>

<local:ColorTemplateSelector x:Key="ColorTemplateSelector"
Expand Down
4 changes: 2 additions & 2 deletions tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ public async Task PopupBox_WithContentTemplateSelector_ChangesContent()


// Assert
var border = await popupBox.GetElement<Border>();
var border = await popupBox.GetElement<Border>("ContentBorder");
await Assert.That(await border.GetBackgroundColor()).IsEqualTo(Colors.Blue);

await button.LeftClick();

await Wait.For(async () =>
{
border = await popupBox.GetElement<Border>();
border = await popupBox.GetElement<Border>("ContentBorder");
await Assert.That(await border.GetBackgroundColor()).IsEqualTo(Colors.Red);
});

Expand Down
Loading