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

Merge pull request #1328 from BDisp/textfield-backspace-fix

Browse Source 
Fixes #1327. Fixes TextField backspace and canceling TextChanging.
This commit is contained in:
Charlie Kindel
2021-05-31 14:57:30 -06:00
committed by GitHub
parent 0413a93bf3 66b46851cb
commit 3f8e9c3f61
2 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Terminal.Gui/Views/TextField.cs
View File

@@ -143,6 +143,9 @@ namespace Terminal.Gui {
var newText = OnTextChanging (value.Split ("\n") [0]);
if (newText.Cancel) {
if (point > text.Count) {
point = text.Count;
}
return;
}
text = TextModel.ToRunes (newText.NewText);
@@ -347,7 +350,11 @@ namespace Terminal.Gui {
return true;
point--;
SetText (text.GetRange (0, oldCursorPos - 1).Concat (text.GetRange (oldCursorPos, text.Count - oldCursorPos)));
if (oldCursorPos < text.Count) {
SetText (text.GetRange (0, oldCursorPos - 1).Concat (text.GetRange (oldCursorPos, text.Count - oldCursorPos)));
} else {
SetText (text.GetRange (0, oldCursorPos - 1));
}
Adjust ();
} else {
DeleteSelectedText ();

67
UnitTests/TextFieldTests.cs
View File

@@ -706,5 +706,72 @@ namespace Terminal.Gui.Views {
_textField.ProcessKey (new KeyEvent ((Key)0x64, new KeyModifiers ())); // d
Assert.Equal ("TAB to jumusedtween text fields.", _textField.Text);
}
[Fact]
public void ProcessKey_Backspace_From_End ()
{
var tf = new TextField ("ABC");
tf.EnsureFocus ();
Assert.Equal ("ABC", tf.Text);
// now delete the C
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("AB", tf.Text);
// then delete the B
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("A", tf.Text);
// then delete the A
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("", tf.Text);
}
[Fact]
public void ProcessKey_Backspace_From_Middle ()
{
var tf = new TextField ("ABC");
tf.EnsureFocus ();
tf.CursorPosition = 2;
Assert.Equal ("ABC", tf.Text);
// now delete the B
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("AC", tf.Text);
// then delete the A
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("C", tf.Text);
// then delete nothing
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("C", tf.Text);
// now delete the C
tf.CursorPosition = 1;
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("", tf.Text);
}
[Fact]
public void Cancel_TextChanging_ThenBackspace ()
{
var tf = new TextField ();
tf.EnsureFocus ();
tf.ProcessKey (new KeyEvent (Key.A, new KeyModifiers ()));
Assert.Equal ("A", tf.Text);
// cancel the next keystroke
tf.TextChanging += (e) => e.Cancel = e.NewText == "AB";
tf.ProcessKey (new KeyEvent (Key.B, new KeyModifiers ()));
// B was canceled so should just be A
Assert.Equal ("A", tf.Text);
// now delete the A
tf.ProcessKey (new KeyEvent (Key.Backspace, new KeyModifiers ()));
Assert.Equal ("", tf.Text);
}
}
}