Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ctrl+Q -> Esc

Browse Source
This commit is contained in:
Tig
2024-06-20 16:17:23 -07:00
parent cb56d5f277
commit 09252d15f0
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Resources/config.json
View File

@@ -18,7 +18,7 @@
"Application.AlternateBackwardKey": "Ctrl+PageUp",
"Application.AlternateForwardKey": "Ctrl+PageDown",
"Application.QuitKey": "Ctrl+Q",
"Application.QuitKey": "Esc",
"Application.IsMouseDisabled": false,
"Theme": "Default",
"Themes": [

1
UICatalog/Resources/config.json
View File

@@ -1,6 +1,5 @@
{
"$schema": "https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json",
"Application.QuitKey": "Esc",
"FileDialog.MaxSearchResults": 10000,
"FileDialogStyle.DefaultUseColors": false,
"FileDialogStyle.DefaultUseUnicodeCharacters": false,

20
UnitTests/Application/KeyboardTests.cs
View File

@@ -36,31 +36,32 @@ public class KeyboardTests
Application.Begin (top);
top.Running = true;
Assert.Equal (KeyCode.Q | KeyCode.CtrlMask, Application.QuitKey.KeyCode);
Application.Driver.SendKeys ('Q', ConsoleKey.Q, false, false, true);
Key prevKey = Application.QuitKey;
Application.OnKeyDown (Application.QuitKey);
Assert.True (isQuiting);
isQuiting = false;
Application.OnKeyDown (Key.Q.WithCtrl);
Application.OnKeyDown (Application.QuitKey);
Assert.True (isQuiting);
isQuiting = false;
Application.QuitKey = Key.C.WithCtrl;
Application.Driver.SendKeys ('Q', ConsoleKey.Q, false, false, true);
Application.OnKeyDown (prevKey); // Should not quit
Assert.False (isQuiting);
Application.OnKeyDown (Key.Q.WithCtrl);
Application.OnKeyDown (Key.Q.WithCtrl);// Should not quit
Assert.False (isQuiting);
Application.OnKeyDown (Application.QuitKey);
Assert.True (isQuiting);
// Reset the QuitKey to avoid throws errors on another tests
Application.QuitKey = Key.Q.WithCtrl;
Application.QuitKey = prevKey;
top.Dispose ();
}
[Fact]
public void QuitKey_Default_Is_CtrlQ ()
public void QuitKey_Default_Is_Esc ()
{
Application.ResetState (true);
// Before Init
@@ -68,7 +69,7 @@ public class KeyboardTests
Application.Init (new FakeDriver ());
// After Init
Assert.Equal (Key.Q.WithCtrl, Application.QuitKey);
Assert.Equal (Key.Esc, Application.QuitKey);
Application.Shutdown();
}
@@ -397,6 +398,8 @@ public class KeyboardTests
// Setup some fake keypresses (This)
var input = "Tests";
Key originalQuitKey = Application.QuitKey;
Application.QuitKey = Key.Q.WithCtrl;
// Put a control-q in at the end
FakeConsole.MockKeyPresses.Push (new ConsoleKeyInfo ('Q', ConsoleKey.Q, false, false, true));
@@ -458,6 +461,7 @@ public class KeyboardTests
};
Application.Run (top);
Application.QuitKey = originalQuitKey;
// Input string should match output
Assert.Equal (input, output);