Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 00:46:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

ListView: Check if pressing enter, selected item is actually in data list

Browse Source 
Returns false if selected index is not in range of the list (stale value or empty list)
This commit is contained in:
Mgamerz
2020-09-17 13:01:49 -06:00
committed by GitHub
parent 6a6b283a9e
commit 9c26ef22f9
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Terminal.Gui/Views/ListView.cs
View File

@@ -450,17 +450,18 @@ namespace Terminal.Gui {
{
if (source.Count == 0){
// Do we set lastSelectedItem to zero here?
return false; //Nothing for us to move to
}
return false; //Nothing for us to move to
}
if (selected >= source.Count) {
// If for some reason we are currently outside of the
// valid values range, we should select the bottommost valid value.
// This can occur if the backing data source changes.
selected = source.Count - 1;
selected = source.Count - 1;
OnSelectedChanged ();
SetNeedsDisplay ();
} else if (selected + 1 < source.Count) { //can move by down by one.
} else if (selected + 1 < source.Count) { //can move by down by one.
selected++;
if (selected >= top + Frame.Height)
top++;
OnSelectedChanged ();
@@ -481,26 +482,25 @@ namespace Terminal.Gui {
{
if (source.Count == 0){
// Do we set lastSelectedItem to zero here?
return false; //Nothing for us to move to
}
return false; //Nothing for us to move to
}
if (selected >= source.Count) {
// If for some reason we are currently outside of the
// valid values range, we should select the bottommost valid value.
// This can occur if the backing data source changes.
selected = source.Count - 1;
selected = source.Count - 1;
OnSelectedChanged ();
SetNeedsDisplay ();
} else if (selected > 0) {
selected--;
} else if (selected > 0) {
selected--;
if (selected > Source.Count) {
selected = Source.Count - 1;
}
if (selected < top)
selected = Source.Count - 1;
}
if (selected < top)
top = selected;
OnSelectedChanged ();
SetNeedsDisplay ();
}
return true;
}
@@ -560,7 +560,8 @@ namespace Terminal.Gui {
/// <returns></returns>
public virtual bool OnOpenSelectedItem ()
{
var value = source.ToList () [selected];
if (source.Count <= selected ||selected < 0) return false;
var value = source.ToList () [selected];
OpenSelectedItem?.Invoke (new ListViewItemEventArgs (selected, value));
return true;