Skip to content

Commit

Permalink
fix: Add missing MenuFlyoutItemStyle implicit style and alias
Browse files Browse the repository at this point in the history
  • Loading branch information
Agnès Zitte committed Mar 13, 2023
1 parent 1d825c6 commit f4642b2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions doc/material-controls-styles.md
Expand Up @@ -33,6 +33,7 @@ HyperlinkButton|HyperlinkButtonStyle|True
HyperlinkButton|SecondaryHyperlinkButtonStyle|
ListView|ListViewStyle|True
ListViewItem|ListViewItemStyle|True
MenuFlyoutItem|MenuFlyoutItemStyle|True
MenuFlyoutPresenter|MenuFlyoutPresenterStyle|True
muxc:NavigationView|NavigationViewStyle|True
muxc:NavigationViewItem|NavigationViewItemStyle|True
Expand Down
2 changes: 2 additions & 0 deletions src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml
Expand Up @@ -25,6 +25,7 @@
<Style BasedOn="{StaticResource MaterialHyperlinkButtonStyle}" TargetType="HyperlinkButton" />
<Style BasedOn="{StaticResource MaterialListViewItemStyle}" TargetType="ListViewItem" />
<Style BasedOn="{StaticResource MaterialListViewStyle}" TargetType="ListView" />
<Style BasedOn="{StaticResource MaterialMenuFlyoutItemStyle}" TargetType="MenuFlyoutItem" />
<Style BasedOn="{StaticResource MaterialMenuFlyoutPresenterStyle}" TargetType="MenuFlyoutPresenter" />
<Style BasedOn="{StaticResource MaterialNavigationViewStyle}" TargetType="muxc:NavigationView" />
<Style BasedOn="{StaticResource MaterialNavigationViewItemStyle}" TargetType="muxc:NavigationViewItem" />
Expand Down Expand Up @@ -53,6 +54,7 @@
<StaticResource x:Key="HyperlinkButtonStyle" ResourceKey="MaterialHyperlinkButtonStyle" />
<StaticResource x:Key="ListViewItemStyle" ResourceKey="MaterialListViewItemStyle" />
<StaticResource x:Key="ListViewStyle" ResourceKey="MaterialListViewStyle" />
<StaticResource x:Key="MenuFlyoutItemStyle" ResourceKey="MaterialMenuFlyoutItemStyle" />
<StaticResource x:Key="MenuFlyoutPresenterStyle" ResourceKey="MaterialMenuFlyoutPresenterStyle" />
<StaticResource x:Key="NavigationViewStyle" ResourceKey="MaterialNavigationViewStyle" />
<StaticResource x:Key="NavigationViewItemStyle" ResourceKey="MaterialNavigationViewItemStyle" />
Expand Down
6 changes: 6 additions & 0 deletions src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
Expand Up @@ -121,6 +121,12 @@ public static class FlyoutPresenter
public static ResourceValue<Style> Default => new("FlyoutPresenterStyle");
}

public static class MenuFlyoutItem
{
[ResourceKeyDefinition(typeof(Style), "MenuFlyoutItemStyle", TargetType = typeof(MenuFlyoutItem))]
public static ResourceValue<Style> Default => new("MenuFlyoutItemStyle");
}

public static class MenuFlyoutPresenter
{
[ResourceKeyDefinition(typeof(Style), "MenuFlyoutPresenterStyle", TargetType = typeof(MenuFlyoutPresenter))]
Expand Down

0 comments on commit f4642b2

Please sign in to comment.