diff --git a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml index b8f034456..44743a9c0 100644 --- a/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml +++ b/src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml @@ -21,36 +21,61 @@ - <Menu>\n - \t<MenuItem Header="File" />\n - \t<MenuItem Header="Edit" />\n - \t<ui:MenuItem Header="Icon" SymbolIcon="Fluent24" />\n - \t<ui:MenuItem SymbolIcon="Fluent24" />\n + <Menu FontSize="14">\n + \t\t\t<ui:MenuItem Header="File" Icon="{ui:SymbolIcon Symbol=Document24}">\n + \t\t\t\t\t\t<ui:MenuItem Header="New" InputGestureText="CTRL+N" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Open..." InputGestureText="CTRL+O" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Save" InputGestureText="CTRL+S" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Save As..." InputGestureText="CTRL+SHIFT+S" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Exit" />\n + \t\t\t</ui:MenuItem>\n + \t\t\t<ui:MenuItem Header="Edit" Icon="{ui:SymbolIcon DocumentEdit20}">\n + \t\t\t\t\t\t<ui:MenuItem Header="Undo" InputGestureText="CTRL+Z" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Cut" InputGestureText="CTRL+X" />\n + \t\t\t\t\t\t <ui:MenuItem Header="Copy" InputGestureText="CTRL+C" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Paste" InputGestureText="CTRL+V" />\n + \t\t\t\t\t\t<ui:MenuItem IsEnabled="False" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Word wrap" InputGestureText="CTRL+SHIFT+W" IsCheckable="True"IsChecked="True" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Find..." InputGestureText="CTRL+F" />\n + \t\t\t\t\t\t<ui:MenuItem Header="Find next" InputGestureText="F3" />\n + \t\t\t\t\t\t<Separator />\n + \t\t\t\t\t\t<ui:MenuItem Header="Select All" InputGestureText="CTRL+A" />\n + \t\t\t</ui:MenuItem>\n + \t\t\t<Separator />\n + \t\t\t<ui:MenuItem Icon="{ui:SymbolIcon TextBold20}" />\n + \t\t\t<ui:MenuItem Icon="{ui:SymbolIcon TextItalic20}" />\n + \t\t\t<ui:MenuItem Icon="{ui:SymbolIcon TextUnderline20}" />\n </Menu> - - - - - - + + + + + - + - + - - - - + + + + - - - + + + - + diff --git a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml index 61a176453..8b770dfc7 100644 --- a/src/Wpf.Ui/Controls/Menu/MenuItem.xaml +++ b/src/Wpf.Ui/Controls/Menu/MenuItem.xaml @@ -68,7 +68,7 @@ VerticalAlignment="Center" Content="{TemplateBinding Icon}" /> + + + + + + + + + + + + + + + + - + @@ -175,7 +191,7 @@ Content="{TemplateBinding Icon}" KeyboardNavigation.IsTabStop="False" /> + + + + + + + + + + + + + + + + - + @@ -218,7 +250,6 @@ - + + + + + + + + + + + + + + + + + @@ -287,7 +336,7 @@ - + @@ -321,7 +370,7 @@ KeyboardNavigation.IsTabStop="False" /> @@ -382,6 +431,22 @@ + + + + + + + + + + + + + + + + - + + + diff --git a/src/Wpf.Ui/Resources/Theme/HC1.xaml b/src/Wpf.Ui/Resources/Theme/HC1.xaml index 06493c04f..7fa258835 100644 --- a/src/Wpf.Ui/Resources/Theme/HC1.xaml +++ b/src/Wpf.Ui/Resources/Theme/HC1.xaml @@ -391,9 +391,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/HC2.xaml b/src/Wpf.Ui/Resources/Theme/HC2.xaml index dd9bf09bb..4710ee461 100644 --- a/src/Wpf.Ui/Resources/Theme/HC2.xaml +++ b/src/Wpf.Ui/Resources/Theme/HC2.xaml @@ -390,9 +390,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/HCBlack.xaml b/src/Wpf.Ui/Resources/Theme/HCBlack.xaml index f1c98689e..27ac80fb6 100644 --- a/src/Wpf.Ui/Resources/Theme/HCBlack.xaml +++ b/src/Wpf.Ui/Resources/Theme/HCBlack.xaml @@ -390,9 +390,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/HCWhite.xaml b/src/Wpf.Ui/Resources/Theme/HCWhite.xaml index 60ef60dd7..c18c05062 100644 --- a/src/Wpf.Ui/Resources/Theme/HCWhite.xaml +++ b/src/Wpf.Ui/Resources/Theme/HCWhite.xaml @@ -390,9 +390,11 @@ - - - + + + + + diff --git a/src/Wpf.Ui/Resources/Theme/Light.xaml b/src/Wpf.Ui/Resources/Theme/Light.xaml index 6a087f540..106a5ea3a 100644 --- a/src/Wpf.Ui/Resources/Theme/Light.xaml +++ b/src/Wpf.Ui/Resources/Theme/Light.xaml @@ -508,8 +508,10 @@ - + + +