Browse Source

Fixes #2636 - Move unicode file/folder icons to Glyphs (#2637)

* Move unicode file/folder icons to Glyphs

* Change to DirectorySeparatorChar for folder icon when no unicode

* Fixed test expectations for linux path separator
Thomas Nind 2 years ago
parent
commit
4a05df9f00

+ 10 - 0
Terminal.Gui/Drawing/Glyphs.cs

@@ -143,6 +143,16 @@ namespace Terminal.Gui {
 
 		#endregion
 
+		/// <summary>
+		/// Folder icon.  Defaults to ꤉ (Kayah Li Digit Nine)
+		/// </summary>
+		public Rune Folder { get; set; } = '꤉';
+
+		/// <summary>
+		/// File icon.  Defaults to ☰ (Trigram For Heaven)
+		/// </summary>
+		public Rune File { get; set; } = '☰';
+
 		#region ----------------- Lines -----------------
 		/// <summary>
 		/// Box Drawings Horizontal Line - Light (U+2500) - ─

+ 2 - 2
Terminal.Gui/FileServices/FileDialogStyle.cs

@@ -237,10 +237,10 @@ namespace Terminal.Gui {
 			var file = args.File;
 
 			if (file is IDirectoryInfo) {
-				return UseUnicodeCharacters ? "\ua909 " : "\\";
+				return UseUnicodeCharacters ? ConfigurationManager.Glyphs.Folder + " " : Path.DirectorySeparatorChar.ToString();
 			}
 
-			return UseUnicodeCharacters ? "\u2630 " : "";
+			return UseUnicodeCharacters ?  ConfigurationManager.Glyphs.File + " " : "";
 
 		}
 

+ 1 - 1
UnitTests/FileServices/FileDialogTests.cs

@@ -392,7 +392,7 @@ namespace Terminal.Gui.FileServicesTests {
  ││Filename (▲)│Size      │Modified                      │Type     ││
  │├────────────┼──────────┼──────────────────────────────┼─────────┤│
  ││..          │          │                              │dir      ││
- ││\subfolder  │          │2002-01-01T22:42:10           │dir      ││
+ ││/subfolder  │          │2002-01-01T22:42:10           │dir      ││
  ││image.gif   │4.00 bytes│2002-01-01T22:42:10           │.gif     ││
  ││jQuery.js   │7.00 bytes│2001-01-01T11:44:42           │.js      ││
  │                                                                  │