Skip to content

Commit 6af8a1c

Browse files
fix open submenu
1 parent db3aa88 commit 6af8a1c

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

ElectronNET-API-Demos/Controllers/MenusController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public IActionResult Index()
1212
if (HybridSupport.IsElectronActive)
1313
{
1414
var menu = new MenuItem[] {
15-
new MenuItem { Label = "Edit", Submenu = new MenuItem[] {
15+
new MenuItem { Label = "Edit", Type = MenuType.submenu, Submenu = new MenuItem[] {
1616
new MenuItem { Label = "Undo", Accelerator = "CmdOrCtrl+Z", Role = MenuRole.undo },
1717
new MenuItem { Label = "Redo", Accelerator = "Shift+CmdOrCtrl+Z", Role = MenuRole.redo },
1818
new MenuItem { Type = MenuType.separator },
@@ -22,7 +22,7 @@ public IActionResult Index()
2222
new MenuItem { Label = "Select All", Accelerator = "CmdOrCtrl+A", Role = MenuRole.selectall }
2323
}
2424
},
25-
new MenuItem { Label = "View", Submenu = new MenuItem[] {
25+
new MenuItem { Label = "View", Type = MenuType.submenu, Submenu = new MenuItem[] {
2626
new MenuItem
2727
{
2828
Label = "Reload",
@@ -76,12 +76,12 @@ public IActionResult Index()
7676
}
7777
}
7878
},
79-
new MenuItem { Label = "Window", Role = MenuRole.window, Submenu = new MenuItem[] {
79+
new MenuItem { Label = "Window", Role = MenuRole.window, Type = MenuType.submenu, Submenu = new MenuItem[] {
8080
new MenuItem { Label = "Minimize", Accelerator = "CmdOrCtrl+M", Role = MenuRole.minimize },
8181
new MenuItem { Label = "Close", Accelerator = "CmdOrCtrl+W", Role = MenuRole.close }
8282
}
8383
},
84-
new MenuItem { Label = "Help", Role = MenuRole.help, Submenu = new MenuItem[] {
84+
new MenuItem { Label = "Help", Role = MenuRole.help, Type = MenuType.submenu, Submenu = new MenuItem[] {
8585
new MenuItem
8686
{
8787
Label = "Learn More",

ElectronNET-API-Demos/ElectronHostHook/connector.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET-API-Demos/ElectronHostHook/connector.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET-API-Demos/ElectronHostHook/excelCreator.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET-API-Demos/ElectronHostHook/excelCreator.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET-API-Demos/ElectronHostHook/index.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET-API-Demos/ElectronHostHook/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET-API-Demos/Views/Menus/Index.cshtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<p>This app uses the code below to set the application menu. If you click the 'View' option in the application menu and then the 'App Menu Demo', you'll see an information box displayed.</p>
2727
<h5>Main Process (C#)</h5>
2828
<pre><code class="csharp">var menu = new MenuItem[] {
29-
new MenuItem { Label = "Edit", Submenu = new MenuItem[] {
29+
new MenuItem { Label = "Edit", Type = MenuType.submenu, Submenu = new MenuItem[] {
3030
new MenuItem { Label = "Undo", Accelerator = "CmdOrCtrl+Z", Role = MenuRole.undo },
3131
new MenuItem { Label = "Redo", Accelerator = "Shift+CmdOrCtrl+Z", Role = MenuRole.redo },
3232
new MenuItem { Type = MenuType.separator },
@@ -36,7 +36,7 @@
3636
new MenuItem { Label = "Select All", Accelerator = "CmdOrCtrl+A", Role = MenuRole.selectall }
3737
}
3838
},
39-
new MenuItem { Label = "View", Submenu = new MenuItem[] {
39+
new MenuItem { Label = "View", Type = MenuType.submenu, Submenu = new MenuItem[] {
4040
new MenuItem
4141
{
4242
Label = "Reload",
@@ -89,12 +89,12 @@
8989
}
9090
}
9191
},
92-
new MenuItem { Label = "Window", Role = MenuRole.window, Submenu = new MenuItem[] {
92+
new MenuItem { Label = "Window", Role = MenuRole.window, Type = MenuType.submenu, Submenu = new MenuItem[] {
9393
new MenuItem { Label = "Minimize", Accelerator = "CmdOrCtrl+M", Role = MenuRole.minimize },
9494
new MenuItem { Label = "Close", Accelerator = "CmdOrCtrl+W", Role = MenuRole.close }
9595
}
9696
},
97-
new MenuItem { Label = "Help", Role = MenuRole.help, Submenu = new MenuItem[] {
97+
new MenuItem { Label = "Help", Role = MenuRole.help, Type = MenuType.submenu, Submenu = new MenuItem[] {
9898
new MenuItem
9999
{
100100
Label = "Learn More",

0 commit comments

Comments
 (0)