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

Merge pull request #856 from BDisp/filedialog-fix

Browse Source 
Fixes #844. The SelectionChanged action it's now working correctly.
This commit is contained in:
Charlie Kindel
2020-08-08 20:10:59 -07:00
committed by GitHub
parent c524c101d2 484d4646c9
commit a1928e3668
1 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,10 +117,11 @@ namespace Terminal.Gui {
switch (me.Flags) {
case MouseFlags.Button1Clicked:
SetSelected (me);
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
break;
case MouseFlags.Button1DoubleClicked:
UnMarkAll ();
SetSelected (me);
if (ExecuteSelection ()) {
host.canceled = false;
@@ -167,6 +168,17 @@ namespace Terminal.Gui {
return true;
}
private void UnMarkAll ()
{
if (allowsMultipleSelection && infos.Count > 0) {
for (int i = 0; i < infos.Count; i++) {
if (infos [i].Item3) {
infos [i] = (infos [i].Item1, infos [i].Item2, false);
}
}
}
}
void SetSelected (MouseEvent me)
{
lastSelected = selected;
@@ -238,15 +250,17 @@ namespace Terminal.Gui {
public Action<ustring> DirectoryChanged { get; set; }
public Action<ustring> FileChanged { get; set; }
void SelectionChanged ()
void OnSelectionChanged ()
{
if (FilePaths.Count > 0)
FileChanged?.Invoke (string.Join (", ", GetFilesName (FilePaths)));
else
FileChanged?.Invoke (infos [selected].Item2 && !canChooseDirectories ? "" : Path.GetFileName (infos [selected].Item1));
if (SelectedChanged != null) {
if (allowsMultipleSelection) {
if (FilePaths.Count > 0) {
FileChanged?.Invoke (string.Join (", ", GetFilesName (FilePaths)));
} else {
FileChanged?.Invoke (infos [selected].Item2 && !canChooseDirectories ? "" : Path.GetFileName (infos [selected].Item1));
}
} else {
var sel = infos [selected];
SelectedChanged ((sel.Item1, sel.Item2));
SelectedChanged?.Invoke ((sel.Item1, sel.Item2));
}
}
@@ -285,13 +299,14 @@ namespace Terminal.Gui {
top = selected;
else
top = 0;
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
return true;
case Key.Enter:
UnMarkAll ();
if (ExecuteSelection ())
return false;
else
@@ -304,7 +319,7 @@ namespace Terminal.Gui {
if (n != selected) {
selected = n;
top = selected;
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
return true;
@@ -329,7 +344,7 @@ namespace Terminal.Gui {
{
selected = infos.Count - 1;
top = infos.Count () - 1;
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
@@ -337,7 +352,7 @@ namespace Terminal.Gui {
{
selected = 0;
top = 0;
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
@@ -347,7 +362,7 @@ namespace Terminal.Gui {
selected++;
if (selected >= top + Frame.Height)
top++;
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
}
@@ -358,12 +373,12 @@ namespace Terminal.Gui {
selected--;
if (selected < top)
top = selected;
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
}
internal bool ExecuteSelection (bool isPrompt = false)
internal bool ExecuteSelection ()
{
if (infos.Count == 0) {
return false;
@@ -371,10 +386,8 @@ 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);
}
Directory = Path.GetFullPath (Path.Combine (Path.GetFullPath (Directory.ToString ()), infos [selected].Item1));
DirectoryChanged?.Invoke (Directory);
} else {
FileChanged?.Invoke (infos [selected].Item1);
if (canChooseFiles) {
@@ -401,7 +414,7 @@ namespace Terminal.Gui {
infos [i] = (infos [i].Item1, infos [i].Item2, !infos [i].Item3);
}
}
SelectionChanged ();
OnSelectionChanged ();
SetNeedsDisplay ();
}
}
@@ -417,28 +430,36 @@ namespace Terminal.Gui {
public string MakePath (string relativePath)
{
return Path.GetFullPath (Path.Combine (Directory.ToString (), relativePath));
var dir = Directory.ToString ();
return string.IsNullOrEmpty (dir) ? "" : Path.GetFullPath (Path.Combine (dir, relativePath));
}
public IReadOnlyList<string> FilePaths {
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) {
return null;
}
if (infos [selected].Item2) {
if (canChooseDirectories)
return new List<string> () { MakePath (infos [selected].Item1) };
if (canChooseDirectories) {
var sel = infos [selected].Item1;
return sel == ".." ? new List<string> () : new List<string> () { MakePath (infos [selected].Item1) };
}
return Array.Empty<string> ();
} else {
if (canChooseFiles)
if (canChooseFiles) {
return new List<string> () { MakePath (infos [selected].Item1) };
}
return Array.Empty<string> ();
}
}
@@ -487,6 +508,7 @@ namespace Terminal.Gui {
Width = Dim.Fill () - 1,
TextChanged = (e) => {
DirectoryPath = dirEntry.Text;
nameEntry.Text = ustring.Empty;
}
};
Add (dirLabel, dirEntry);
@@ -510,9 +532,9 @@ namespace Terminal.Gui {
};
DirectoryPath = Path.GetFullPath (Environment.CurrentDirectory);
Add (dirListView);
dirListView.DirectoryChanged = (dir) => dirEntry.Text = dir;
dirListView.FileChanged = (file) => nameEntry.Text = file;
dirListView.DirectoryChanged = (dir) => { nameEntry.Text = ustring.Empty; dirEntry.Text = dir; };
dirListView.FileChanged = (file) => nameEntry.Text = file == ".." ? "" : file;
dirListView.SelectedChanged = (file) => nameEntry.Text = file.Item1 == ".." ? "" : file.Item1;
this.cancel = new Button ("Cancel");
this.cancel.Clicked += () => {
canceled = true;
@@ -524,7 +546,6 @@ namespace Terminal.Gui {
IsDefault = true,
};
this.prompt.Clicked += () => {
dirListView.ExecuteSelection (true);
canceled = false;
Application.RequestStop ();
};