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 #2845 from MaciekWin3/v2_develop

Browse Source 
Fixes #2824. Add SearchText property to combobox in v2
This commit is contained in:
Tig
2023-09-29 11:20:07 -06:00
committed by GitHub
parent 0a0efe103a 5ef85b6cfb
commit 8b514dc313
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Terminal.Gui/Views/ComboBox.cs
View File

@@ -39,10 +39,7 @@ namespace Terminal.Gui {
private void Initialize (ComboBox container, bool hideDropdownListOnClick)
{
if (container == null)
throw new ArgumentNullException ("ComboBox container cannot be null.", nameof (container));
this.container = container;
this.container = container ?? throw new ArgumentNullException (nameof (container), "ComboBox container cannot be null.");
HideDropdownListOnClick = hideDropdownListOnClick;
}
@@ -236,7 +233,7 @@ namespace Terminal.Gui {
readonly TextField search;
readonly ComboListView listview;
bool autoHide = true;
int minimumHeight = 2;
readonly int minimumHeight = 2;
/// <summary>
/// Public constructor
@@ -296,7 +293,7 @@ namespace Terminal.Gui {
listview.Y = Pos.Bottom (search);
listview.OpenSelectedItem += (object sender, ListViewItemEventArgs a) => Selected ();
this.Add (search, listview);
Add (search, listview);
// On resize
LayoutComplete += (object sender, LayoutEventArgs a) => {
@@ -723,7 +720,19 @@ namespace Terminal.Gui {
return text;
}
set {
search.Text = text = value;
SetSearchText (value);
}
}
/// <summary>
/// Current search text
/// </summary>
public string SearchText {
get {
return search.Text;
}
set {
SetSearchText (value);
}
}
@@ -779,7 +788,7 @@ namespace Terminal.Gui {
private void Reset (bool keepSearchText = false)
{
if (!keepSearchText) {
search.Text = text = "";
SetSearchText (string.Empty);
}
ResetSearchSet ();
@@ -791,6 +800,10 @@ namespace Terminal.Gui {
search.SetFocus ();
}
}
private void SetSearchText (string value)
{
search.Text = text = value;
}
private void ResetSearchSet (bool noCopy = false)
{
@@ -847,7 +860,7 @@ namespace Terminal.Gui {
listview.SetSource (searchset);
listview.Clear (); // Ensure list shrinks in Dialog as you type
listview.Height = CalculatetHeight ();
this.SuperView?.BringSubviewToFront (this);
SuperView?.BringSubviewToFront (this);
}
/// <summary>
@@ -861,7 +874,7 @@ namespace Terminal.Gui {
OnOpenSelectedItem ();
}
var rect = listview.ViewToScreen (listview.Bounds);
Reset (SelectedItem > -1);
Reset (keepSearchText: true);
listview.Clear (rect);
listview.TabStop = false;
SuperView?.SendSubviewToBack (this);

4
UnitTests/Views/ComboBoxTests.cs
View File

@@ -101,7 +101,7 @@ namespace Terminal.Gui.ViewsTests {
cb.Text = "Tw";
Assert.True (cb.ProcessKey (new KeyEvent (Key.Enter, new KeyModifiers ())));
Assert.True (opened);
Assert.Equal ("", cb.Text);
Assert.Equal ("Tw", cb.Text);
Assert.False (cb.IsShow);
cb.SetSource (null);
Assert.False (cb.ProcessKey (new KeyEvent (Key.Enter, new KeyModifiers ())));
@@ -262,7 +262,7 @@ Three
Assert.False (cb.IsShow);
Assert.Equal (2, cb.Source.Count);
Assert.Equal (-1, cb.SelectedItem);
Assert.Equal ("", cb.Text);
Assert.Equal ("T", cb.Text);
Assert.True (cb.ProcessKey (new KeyEvent (Key.Esc, new KeyModifiers ())));
Assert.False (cb.IsShow);
Assert.Equal (-1, cb.SelectedItem); // retains last accept selected item