Skip to content

Commit 846795c

Browse files
authored
1 parent 369d7c3 commit 846795c

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

ModernWpf.Controls/Flyout/FlyoutPresenter.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
1616
<Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderThemeBrush}" />
1717
<Setter Property="BorderThickness" Value="{DynamicResource FlyoutBorderThemeThickness}" />
18-
<Setter Property="Padding" Value="{DynamicResource FlyoutContentPadding}" />
18+
<Setter Property="Padding" Value="{DynamicResource FlyoutContentThemePadding}" />
1919
<Setter Property="MinWidth" Value="{DynamicResource FlyoutThemeMinWidth}" />
2020
<Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
2121
<Setter Property="MinHeight" Value="{DynamicResource FlyoutThemeMinHeight}" />

ModernWpf/ControlsResources.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
<sys:Double x:Key="ToggleSwitchPreContentMargin">6</sys:Double>
7070
<sys:Double x:Key="ToggleSwitchPostContentMargin">6</sys:Double>
7171
<sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>
72-
<Thickness x:Key="FlyoutContentPadding">12</Thickness>
7372

7473
<ControlTemplate x:Key="TextControlValidationErrorTemplate">
7574
<Grid SnapsToDevicePixels="True">

test/ModernWpfTestApp/CommonStylesPage.xaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,18 @@
394394
<RadioButton
395395
Style="{StaticResource DefaultRadioButtonStyle}"
396396
Content="I am a RadioButton with DefaultRadioButtonStyle set" />
397+
398+
<ButtonEx Content="Test flyout">
399+
<ButtonEx.Flyout>
400+
<Flyout>
401+
<StackPanel>
402+
<TextBlock Style="{DynamicResource BaseTextBlockStyle}" Text="All items will be removed. Do you want to continue?" Margin="0,0,0,12" />
403+
<Button Content="Yes, empty my cart" />
404+
</StackPanel>
405+
</Flyout>
406+
</ButtonEx.Flyout>
407+
</ButtonEx>
408+
397409
</StackPanel>
398410
</Border>
399411
<Border Style="{DynamicResource CompactBorderStyle}">

0 commit comments

Comments
 (0)