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

Removed unnecessary parameter on ExecuteSelection and if AllowsMultipleSelection is true ensures that at least the valid current file path is returned if none is marked.

Browse Source
This commit is contained in:
BDisp
2020-08-08 17:27:54 +01:00
parent 972dde84f5
commit 4f9943c7a1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Terminal.Gui/Windows/FileDialog.cs
View File

@@ -378,7 +378,7 @@ namespace Terminal.Gui {
}
}
internal bool ExecuteSelection (bool isPrompt = false)
internal bool ExecuteSelection ()
{
if (infos.Count == 0) {
return false;
@@ -386,11 +386,9 @@ namespace Terminal.Gui {
var isDir = infos [selected].Item2;
if (isDir) {
if (!isPrompt) {
Directory = Path.GetFullPath (Path.Combine (Path.GetFullPath (Directory.ToString ()), infos [selected].Item1));
DirectoryChanged?.Invoke (Directory);
}
} else if (!isPrompt) {
Directory = Path.GetFullPath (Path.Combine (Path.GetFullPath (Directory.ToString ()), infos [selected].Item1));
DirectoryChanged?.Invoke (Directory);
} else {
FileChanged?.Invoke (infos [selected].Item1);
if (canChooseFiles) {
// Ensures that at least one file is selected.
@@ -439,9 +437,13 @@ namespace Terminal.Gui {
get {
if (allowsMultipleSelection) {
var res = new List<string> ();
foreach (var item in infos)
foreach (var item in infos) {
if (item.Item3)
res.Add (MakePath (item.Item1));
}
if (res.Count == 0 && infos.Count > 0 && infos [selected].Item1 != "..") {
res.Add (MakePath (infos [selected].Item1));
}
return res;
} else {
if (infos.Count == 0) {
@@ -542,7 +544,6 @@ namespace Terminal.Gui {
IsDefault = true,
};
this.prompt.Clicked += () => {
dirListView.ExecuteSelection (true);
canceled = false;
Application.RequestStop ();
};