From debff326cf5eed3885b020f57aba2e557969702c Mon Sep 17 00:00:00 2001 From: tznind Date: Wed, 8 Mar 2023 07:48:11 +0000 Subject: [PATCH] Fix build error --- Terminal.Gui/Windows/FileDialog2.cs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Terminal.Gui/Windows/FileDialog2.cs b/Terminal.Gui/Windows/FileDialog2.cs index a68ceb761..c5ebffffa 100644 --- a/Terminal.Gui/Windows/FileDialog2.cs +++ b/Terminal.Gui/Windows/FileDialog2.cs @@ -1383,15 +1383,21 @@ namespace Terminal.Gui { StringComparer.InvariantCultureIgnoreCase); } - internal object GetOrderByValue (string columnName) + internal object GetOrderByValue (FileDialog2 dlg, string columnName) { - switch (columnName) { - case HeaderFilename: return this.FileSystemInfo.Name; - case HeaderSize: return this.MachineReadableLength; - case HeaderModified: return this.DateModified; - case HeaderType: return this.Type; - default: throw new ArgumentOutOfRangeException (nameof (columnName)); - } + if (dlg.Style.FilenameColumnName == columnName) + return this.FileSystemInfo.Name; + + if (dlg.Style.SizeColumnName == columnName) + return this.MachineReadableLength; + + if (dlg.Style.ModifiedColumnName == columnName) + return this.DateModified; + + if (dlg.Style.TypeColumnName == columnName) + return this.Type; + + throw new ArgumentOutOfRangeException ("Unknown column " + nameof (columnName)); } internal object GetOrderByDefault () @@ -1989,7 +1995,7 @@ namespace Terminal.Gui { sortAlgorithm = (v) => v.GetOrderByDefault (); this.currentSortIsAsc = true; } else { - sortAlgorithm = (v) => v.GetOrderByValue (colName); + sortAlgorithm = (v) => v.GetOrderByValue (dlg,colName); } var ordered =