Skip to content

Refactor PopupBox placement to respect configurable elevation #3136

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
Keboo merged 8 commits into from
Apr 8, 2023
Merged

Refactor PopupBox placement to respect configurable elevation #3136

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b1777ed
Add failing UI test
nicolaihenriksen Mar 11, 2023
dbe3a64
Fix Card clipping issue
nicolaihenriksen Mar 11, 2023
d995ab6
Refactor PopupBox custom popup placement
nicolaihenriksen Mar 11, 2023
0dd2e87
Add dedicated demo app page for PopupBox
nicolaihenriksen Mar 11, 2023
cc4bf65
Small cleanup done during review on stream
Keboo Mar 16, 2023
d45e5b9
Change implementation to dedicated DP
nicolaihenriksen Apr 3, 2023
1988f83
Fix PopupTest to use new dedicated DP
nicolaihenriksen Apr 3, 2023
f462017
Moving converters inside of the tempalate
Keboo Apr 8, 2023
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
Prev Previous commit
Moving converters inside of the tempalate
  • Loading branch information
@Keboo
Keboo committed Apr 8, 2023
commit f4620173b934930f7795e5b40b7759fea4664385
8 changes: 4 additions & 4 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToolTip.xaml" />
</ResourceDictionary.MergedDictionaries>

<wpf:ElevationMarginConverter x:Key="ElevationMarginConverter" />
<wpf:ElevationRadiusConverter x:Key="ElevationRadiusConverter" Multiplier="-1" />
<wpf:ElevationRadiusConverter x:Key="RtlElevationRadiusConverter" Multiplier="1" />

<Style x:Key="MaterialDesignPopupBoxButton" TargetType="{x:Type Button}">
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
Expand Down Expand Up @@ -97,6 +93,10 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type wpf:PopupBox}">
<ControlTemplate.Resources>
<wpf:ElevationMarginConverter x:Key="ElevationMarginConverter" />
<wpf:ElevationRadiusConverter x:Key="ElevationRadiusConverter" Multiplier="-1" />
<wpf:ElevationRadiusConverter x:Key="RtlElevationRadiusConverter" Multiplier="1" />

<Style TargetType="Separator" BasedOn="{StaticResource MaterialDesignSeparator}" />
<Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
<Setter Property="Template">
Expand Down