Skip to content

Commit 794979d

Browse files
authored
fix: MenuItem hover animation disappears after click (lepoco#1451)
1 parent 7535b91 commit 794979d

File tree

8 files changed

+232
-65
lines changed

8 files changed

+232
-65
lines changed

src/Wpf.Ui.Gallery/Views/Pages/Navigation/MenuPage.xaml

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,61 @@
2121
<Grid Margin="0,0,0,24">
2222
<controls:ControlExample Margin="0" HeaderText="Standard Menu.">
2323
<controls:ControlExample.XamlCode>
24-
&lt;Menu&gt;\n
25-
\t&lt;MenuItem Header=&quot;File&quot; /&gt;\n
26-
\t&lt;MenuItem Header=&quot;Edit&quot; /&gt;\n
27-
\t&lt;ui:MenuItem Header=&quot;Icon&quot; SymbolIcon=&quot;Fluent24&quot; /&gt;\n
28-
\t&lt;ui:MenuItem SymbolIcon=&quot;Fluent24&quot; /&gt;\n
24+
&lt;Menu FontSize="14"&gt;\n
25+
\t\t\t&lt;ui:MenuItem Header="File" Icon="{ui:SymbolIcon Symbol=Document24}"&gt;\n
26+
\t\t\t\t\t\t&lt;ui:MenuItem Header="New" InputGestureText="CTRL+N" /&gt;\n
27+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Open..." InputGestureText="CTRL+O" /&gt;\n
28+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Save" InputGestureText="CTRL+S" /&gt;\n
29+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Save As..." InputGestureText="CTRL+SHIFT+S" /&gt;\n
30+
\t\t\t\t\t\t&lt;Separator /&gt;\n
31+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Exit" /&gt;\n
32+
\t\t\t&lt;/ui:MenuItem&gt;\n
33+
\t\t\t&lt;ui:MenuItem Header="Edit" Icon="{ui:SymbolIcon DocumentEdit20}"&gt;\n
34+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Undo" InputGestureText="CTRL+Z" /&gt;\n
35+
\t\t\t\t\t\t&lt;Separator /&gt;\n
36+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Cut" InputGestureText="CTRL+X" /&gt;\n
37+
\t\t\t\t\t\t &lt;ui:MenuItem Header="Copy" InputGestureText="CTRL+C" /&gt;\n
38+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Paste" InputGestureText="CTRL+V" /&gt;\n
39+
\t\t\t\t\t\t&lt;ui:MenuItem IsEnabled="False" /&gt;\n
40+
\t\t\t\t\t\t&lt;Separator /&gt;\n
41+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Word wrap" InputGestureText="CTRL+SHIFT+W" IsCheckable="True"IsChecked="True" /&gt;\n
42+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Find..." InputGestureText="CTRL+F" /&gt;\n
43+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Find next" InputGestureText="F3" /&gt;\n
44+
\t\t\t\t\t\t&lt;Separator /&gt;\n
45+
\t\t\t\t\t\t&lt;ui:MenuItem Header="Select All" InputGestureText="CTRL+A" /&gt;\n
46+
\t\t\t&lt;/ui:MenuItem&gt;\n
47+
\t\t\t&lt;Separator /&gt;\n
48+
\t\t\t&lt;ui:MenuItem Icon="{ui:SymbolIcon TextBold20}" /&gt;\n
49+
\t\t\t&lt;ui:MenuItem Icon="{ui:SymbolIcon TextItalic20}" /&gt;\n
50+
\t\t\t&lt;ui:MenuItem Icon="{ui:SymbolIcon TextUnderline20}" /&gt;\n
2951
&lt;/Menu&gt;
3052
</controls:ControlExample.XamlCode>
3153
<Menu FontSize="14">
32-
<ui:MenuItem Header="File" Icon="{ui:SymbolIcon DocumentSplitHint20}">
33-
<MenuItem Header="New" />
34-
<MenuItem Header="New window" />
35-
<MenuItem Header="Open..." />
36-
<MenuItem Header="Save" />
37-
<MenuItem Header="Save As..." />
54+
<ui:MenuItem Header="File" Icon="{ui:SymbolIcon Symbol=Document24}">
55+
<ui:MenuItem Header="New" InputGestureText="CTRL+N" />
56+
<ui:MenuItem Header="Open..." InputGestureText="CTRL+O" />
57+
<ui:MenuItem Header="Save" InputGestureText="CTRL+S" />
58+
<ui:MenuItem Header="Save As..." InputGestureText="CTRL+SHIFT+S" />
3859
<Separator />
39-
<MenuItem Header="Exit" />
60+
<ui:MenuItem Header="Exit" />
4061
</ui:MenuItem>
4162
<ui:MenuItem Header="Edit" Icon="{ui:SymbolIcon DocumentEdit20}">
42-
<MenuItem Header="Undo" />
63+
<ui:MenuItem Header="Undo" InputGestureText="CTRL+Z" />
4364
<Separator />
44-
<MenuItem Header="Cut" />
45-
<MenuItem Header="Copy" />
46-
<MenuItem Header="Paste" />
47-
<MenuItem IsEnabled="False" />
65+
<ui:MenuItem Header="Cut" InputGestureText="CTRL+X" />
66+
<ui:MenuItem Header="Copy" InputGestureText="CTRL+C" />
67+
<ui:MenuItem Header="Paste" InputGestureText="CTRL+V" />
68+
<ui:MenuItem IsEnabled="False" />
4869
<Separator />
49-
<MenuItem Header="Search with browser" />
50-
<MenuItem Header="Find..." />
51-
<MenuItem Header="Find next" />
70+
<ui:MenuItem
71+
Header="Word wrap"
72+
InputGestureText="CTRL+SHIFT+W"
73+
IsCheckable="True"
74+
IsChecked="True" />
75+
<ui:MenuItem Header="Find..." InputGestureText="CTRL+F" />
76+
<ui:MenuItem Header="Find next" InputGestureText="F3" />
5277
<Separator />
53-
<MenuItem Header="Select All" />
78+
<ui:MenuItem Header="Select All" InputGestureText="CTRL+A" />
5479
</ui:MenuItem>
5580
<Separator />
5681
<ui:MenuItem Icon="{ui:SymbolIcon TextBold20}" />

0 commit comments

Comments
 (0)