From c53acea225937947f97c3325f3ce84de06051e0e Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 29 Oct 2020 15:05:07 +0000 Subject: [PATCH 1/2] Fixes #986. Comparing with ShortcutHelper.GetModifiersKey in the demo.cs --- Example/demo.cs | 4 +++- FSharpExample/Program.fs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Example/demo.cs b/Example/demo.cs index a763a4440..a381a7e2f 100644 --- a/Example/demo.cs +++ b/Example/demo.cs @@ -689,12 +689,14 @@ static class Demo { private static void Win_KeyPress (View.KeyEventEventArgs e) { - if ((e.KeyEvent.Key & (Key.CtrlMask | Key.T)) != 0) { + switch (ShortcutHelper.GetModifiersKey (e.KeyEvent)) { + case Key.CtrlMask | Key.T: if (menu.IsMenuOpen) menu.CloseMenu (); else menu.OpenMenu (); e.Handled = true; + break; } } } diff --git a/FSharpExample/Program.fs b/FSharpExample/Program.fs index eeee7a798..bc9fcbe82 100644 --- a/FSharpExample/Program.fs +++ b/FSharpExample/Program.fs @@ -425,7 +425,7 @@ let Main () = StatusItem(Key.F1, ustr "~F1~ Help", Action Help) StatusItem(Key.F2, ustr "~F2~ Load", Action Load) StatusItem(Key.F3, ustr "~F3~ Save", Action Save) - StatusItem(Key.ControlQ, ustr "~^Q~ Quit", fun () -> if (Quit()) then top.Running <- false) |]) + StatusItem(Key.Q, ustr "~^Q~ Quit", fun () -> if (Quit()) then top.Running <- false) |]) win.Add (drag, dragText) let bottom = new Label (ustr "This should go on the bottom of the same top-level!") win.Add bottom From 3343062cad00d22829c8cdc8bcee16f0ac2fffc0 Mon Sep 17 00:00:00 2001 From: BDisp Date: Thu, 29 Oct 2020 15:49:42 +0000 Subject: [PATCH 2/2] Change to Key.Q because it conflicts with Linux terminal. --- Example/demo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Example/demo.cs b/Example/demo.cs index a381a7e2f..1bcc64446 100644 --- a/Example/demo.cs +++ b/Example/demo.cs @@ -244,7 +244,7 @@ static class Demo { var menu = new MenuBar (new MenuBarItem [] { new MenuBarItem ("_File", new MenuItem [] { - new MenuItem ("_Close", "", () => { if (Quit ()) { running = MainApp; Application.RequestStop (); } }, null, null, Key.AltMask | Key.F4), + new MenuItem ("_Close", "", () => { if (Quit ()) { running = MainApp; Application.RequestStop (); } }, null, null, Key.AltMask | Key.Q), }), new MenuBarItem ("_Edit", new MenuItem [] { new MenuItem ("_Copy", "", null, null, null, Key.C | Key.CtrlMask), @@ -314,7 +314,7 @@ static class Demo { var ntop = Application.Top; var menu = new MenuBar (new MenuBarItem [] { new MenuBarItem ("_File", new MenuItem [] { - new MenuItem ("_Close", "", () => { running = MainApp; Application.RequestStop (); }, null, null, Key.AltMask | Key.F4), + new MenuItem ("_Close", "", () => { running = MainApp; Application.RequestStop (); }, null, null, Key.AltMask | Key.Q), }), }); ntop.Add (menu); @@ -601,7 +601,7 @@ static class Demo { new MenuItem ("_New", "Creates new file", NewFile, null, null, Key.AltMask | Key.CtrlMask| Key.N), new MenuItem ("_Open", "", Open, null, null, Key.AltMask | Key.CtrlMask| Key.O), new MenuItem ("_Hex", "", () => { running = ShowHex; Application.RequestStop (); }, null, null, Key.AltMask | Key.CtrlMask | Key.H), - new MenuItem ("_Close", "", Close, null, null, Key.AltMask | Key.F4), + new MenuItem ("_Close", "", Close, null, null, Key.AltMask | Key.Q), new MenuItem ("_Disabled", "", () => { }, () => false), null, new MenuItem ("_Quit", "", () => { if (Quit ()) { running = null; top.Running = false; } }, null, null, Key.CtrlMask | Key.Q)