Sort entries in BigListBox alphabetically by default

Author: tznind

src/UI/ValueFactory.cs

@@ -305,7 +305,7 @@ private static bool GetNewColorSchemeValue(Design design, out object? newValue)
             // add the option to jump to custom colors
             offer.Add(custom);
 
-            if (Modals.Get("Color Scheme", "Ok", offer.ToArray(), design.View.ColorScheme, out var selected))
+            if (Modals.Get("Color Scheme", "Ok", offer.ToArray(), design.View.ColorScheme, out var selected,false))
             {
                 // if user clicked "Custom..."
                 if (selected is string s && string.Equals(s, custom))

src/UI/Windows/BigListBox.cs

@@ -47,17 +47,23 @@ public class BigListBox<T>
     /// <param name="displayMember">What to display in the list box (defaults to <see cref="object.ToString"/>.</param>
     /// <param name="addNull">Creates a selection option "Null" that returns a null selection.</param>
     /// <param name="currentSelection">The optional existing value, if present it should be selected in the list.</param>
-    public BigListBox(
-        string prompt,
+    /// <param name="sort"></param>
+    public BigListBox(string prompt,
         string okText,
         in bool addSearch,
         IList<T> collection,
         Func<T?, string> displayMember,
         bool addNull,
-        T? currentSelection)
+        T? currentSelection, bool sort = true)
     {
         this.AspectGetter = displayMember ?? (arg => arg?.ToString() ?? string.Empty);
 
+        // Sort alphabetically according to display member
+        if (sort)
+        {
+            collection = collection.OrderBy(e => AspectGetter(e)).ToList();
+        }
+
         this.publicCollection = collection ?? throw new ArgumentNullException( nameof( collection ) );
         this.addNull = addNull;
 

src/UI/Windows/ChoicesDialog.cs

@@ -94,34 +94,8 @@ public ChoicesDialog(string title, string message, params string[] options) {
 
         Width = Math.Min(Math.Max(maxWidthLine, Math.Max(Title.GetColumns(), Math.Max(textWidth + 2, buttonWidth))), Application.Driver.Cols);
         Height = msgboxHeight;
-    }
-    
-    /// <inheritdoc/>
-    protected override void OnDrawComplete()
-    {
-        base.OnDrawComplete();
-
-        var screenTopLeft = FrameToScreen();
-        Driver.Move(screenTopLeft.X+2, screenTopLeft.Y);
-        
-        var padding = ((Viewport.Width - _title.EnumerateRunes().Sum(v=>v.GetColumns())) / 2) - 1;
-
-        Driver.SetAttribute(
-            new Attribute(ColorScheme.Normal.Foreground, ColorScheme.Normal.Background));
-        
-        Driver.AddStr(string.Join("",Enumerable.Repeat(Glyphs.HLineHv, padding)));
-
-        Driver.SetAttribute(
-            new Attribute(ColorScheme.Normal.Background, ColorScheme.Normal.Foreground));
-        Driver.AddStr(_title);
-
-        Driver.SetAttribute(
-            new Attribute(ColorScheme.Normal.Foreground, ColorScheme.Normal.Background));
-
-        StringBuilder sb = new StringBuilder();
-        sb.Append(Glyphs.HLineHv);
 
-        Driver.AddStr(string.Join("", Enumerable.Repeat(Glyphs.HLineHv.ToString(), padding)));
+        btn1.FocusDeepest(NavigationDirection.Forward, TabBehavior.TabGroup);
     }
 
     internal static int Query(string title, string message, params string[] options)

src/UI/Windows/Modals.cs

@@ -136,14 +136,14 @@ internal static bool GetString(string windowTitle, string entryLabel, string? in
         return false;
     }
 
-    internal static bool Get<T>(string prompt, string okText, T[] collection, T? currentSelection, out T? selected)
+    internal static bool Get<T>(string prompt, string okText, T[] collection, T? currentSelection, out T? selected, bool sort = true)
     {
-        return Get(prompt, okText, true, collection, o => o is Type t ? t.Name : o?.ToString() ?? "Null", false, currentSelection, out selected);
+        return Get(prompt, okText, true, collection, o => o is Type t ? t.Name : o?.ToString() ?? "Null", false, currentSelection, out selected,sort);
     }
 
-    internal static bool Get<T>( string prompt, string okText, in bool addSearch, T[] collection, Func<T?, string> displayMember, bool addNull, [NotNullWhen( true )]T? currentSelection, [NotNullWhen( true )] out T? selected )
+    internal static bool Get<T>( string prompt, string okText, in bool addSearch, T[] collection, Func<T?, string> displayMember, bool addNull, [NotNullWhen( true )]T? currentSelection, [NotNullWhen( true )] out T? selected, bool sort=true )
     {
-        var pick = new BigListBox<T>( prompt, okText, in addSearch, collection, displayMember, addNull, currentSelection );
+        var pick = new BigListBox<T>( prompt, okText, in addSearch, collection, displayMember, addNull, currentSelection,sort );
         bool toReturn = pick.ShowDialog( );
         selected = pick.Selected;
         return toReturn;