|
198 | 198 | <Setter Property="TextBlock.TextDecorations" Value=""/> |
199 | 199 | <Setter Property="Template"> |
200 | 200 | <ControlTemplate> |
201 | | - <Grid Effect="drop-shadow(0 0 8 #30000000)"> |
202 | | - <Border Margin="8" |
203 | | - Padding="8,6" |
| 201 | + <Grid Margin="8" Effect="drop-shadow(0 0 8 #30000000)"> |
| 202 | + <Border Padding="8,6" |
204 | 203 | CornerRadius="4" |
205 | 204 | Background="{DynamicResource Brush.Popup}" |
206 | 205 | BorderBrush="{DynamicResource Brush.Border2}" |
|
227 | 226 |
|
228 | 227 | <Setter Property="Template"> |
229 | 228 | <ControlTemplate> |
230 | | - <Border Margin="4" CornerRadius="{TemplateBinding CornerRadius}" Effect="drop-shadow(0 0 4 #A0000000)"> |
| 229 | + <Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)"> |
231 | 230 | <Border Name="LayoutRoot" |
232 | 231 | Padding="12" |
233 | 232 | Background="{DynamicResource Brush.Popup}" |
|
245 | 244 | VerticalContentAlignment="Stretch" /> |
246 | 245 | </ScrollViewer> |
247 | 246 | </Border> |
248 | | - </Border> |
| 247 | + </Grid> |
249 | 248 | </ControlTemplate> |
250 | 249 | </Setter> |
251 | 250 | </Style> |
|
814 | 813 | <Setter Property="VerticalOffset" Value="-4"/> |
815 | 814 | <Setter Property="Template"> |
816 | 815 | <ControlTemplate> |
817 | | - <Grid> |
818 | | - <Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4" CornerRadius="{TemplateBinding CornerRadius}"> |
819 | | - <Border.Effect> |
820 | | - <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/> |
821 | | - </Border.Effect> |
822 | | - </Border> |
823 | | - |
| 816 | + <Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)"> |
824 | 817 | <Border BorderThickness="0" |
825 | | - Margin="8,4" |
| 818 | + Background="{DynamicResource Brush.Popup}" |
| 819 | + CornerRadius="{TemplateBinding CornerRadius}" |
| 820 | + Padding="8,4" |
826 | 821 | MaxWidth="{TemplateBinding MaxWidth}" |
827 | 822 | MinHeight="{TemplateBinding MinHeight}" |
828 | 823 | HorizontalAlignment="{TemplateBinding HorizontalAlignment}"> |
|
842 | 837 | <Style Selector="MenuFlyoutPresenter"> |
843 | 838 | <Setter Property="Template"> |
844 | 839 | <ControlTemplate> |
845 | | - <Grid> |
846 | | - <Border Background="{DynamicResource Brush.Popup}" BorderThickness="0" Margin="4" CornerRadius="{TemplateBinding CornerRadius}"> |
847 | | - <Border.Effect> |
848 | | - <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/> |
849 | | - </Border.Effect> |
850 | | - </Border> |
851 | | - |
| 840 | + <Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)"> |
852 | 841 | <Border Name="LayoutRoot" |
853 | | - Margin="4" |
854 | | - Background="Transparent" |
| 842 | + Background="{DynamicResource Brush.Popup}" |
855 | 843 | BorderBrush="{TemplateBinding BorderBrush}" |
856 | 844 | BorderThickness="0" |
857 | 845 | Padding="4,2" |
|
962 | 950 | HorizontalOffset="-4" |
963 | 951 | VerticalOffset="-4" |
964 | 952 | IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"> |
965 | | - <Grid> |
966 | | - <Border Background="{DynamicResource Brush.Popup}" Margin="4" CornerRadius="{DynamicResource OverlayCornerRadius}"> |
967 | | - <Border.Effect> |
968 | | - <DropShadowEffect OffsetX="0" OffsetY="0" Color="Black" BlurRadius="4" Opacity=".6"/> |
969 | | - </Border.Effect> |
970 | | - </Border> |
971 | | - |
972 | | - <Border BorderThickness="0" Margin="8,4" MaxHeight="400"> |
| 953 | + <Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)"> |
| 954 | + <Border BorderThickness="0" Padding="8,4" MaxHeight="400" Background="{DynamicResource Brush.Popup}" CornerRadius="{DynamicResource OverlayCornerRadius}"> |
973 | 955 | <ScrollViewer> |
974 | 956 | <ItemsPresenter Name="PART_ItemsPresenter" |
975 | 957 | Margin="{DynamicResource MenuFlyoutScrollerMargin}" |
|
0 commit comments