Merge pull request #987 from BDisp/demo-keys-fix

Fixes #986. Comparing with ShortcutHelper.GetModifiersKey in the demo.cs

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)
@@ -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;
 		}
 	}
 }

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