fix - Fixed IFM and settings not working properly

--- We've fixed IFM and Settings TUIs not rendering entries properly. We've also fixed mouse input for the Settings TUI. --- Type: fix Breaking: False Doc Required: False Backport Required: False Part: 1/1
Aptivi · Aug 30, 2024 · cce1036 · cce1036
1 parent c55b1a2
commit cce1036
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 40 deletions.
diff --git a/public/Nitrocid/Misc/Interactives/FileManagerCli.cs b/public/Nitrocid/Misc/Interactives/FileManagerCli.cs
@@ -163,6 +163,14 @@ public override string GetEntryFromItem(FileSystemEntry item)
             }
         }
 
+        /// <inheritdoc/>
+        public override string GetStatusFromItemSecondary(FileSystemEntry item) =>
+            GetStatusFromItem(item);
+
+        /// <inheritdoc/>
+        public override string GetEntryFromItemSecondary(FileSystemEntry item) =>
+            GetEntryFromItem(item);
+
         internal void Open(FileSystemEntry entry1, FileSystemEntry entry2)
         {
             try

diff --git a/public/Nitrocid/Misc/Interactives/SettingsCli.cs b/public/Nitrocid/Misc/Interactives/SettingsCli.cs
@@ -106,21 +106,10 @@ public class SettingsCli : BaseInteractiveTui<(string, int)>, IInteractiveTui<(s
         /// <inheritdoc/>
         public override string GetStatusFromItem((string, int) item)
         {
-            string status;
-            if (CurrentPane == 2)
-            {
-                string keyName = item.Item1;
-                int keyIdx = item.Item2;
-                string keyDesc = config.SettingsEntries[FirstPaneCurrentSelection - 1].Keys[keyIdx].Description;
-                status = $"K: {keyName} - {keyDesc}";
-            }
-            else
-            {
-                string entryName = item.Item1;
-                int entryIdx = item.Item2;
-                string entryDesc = config.SettingsEntries[entryIdx].Desc;
-                status = $"E: {entryName} - {entryDesc}";
-            }
+            string entryName = item.Item1;
+            int entryIdx = item.Item2;
+            string entryDesc = config.SettingsEntries[entryIdx].Desc;
+            string status = $"E: {entryName} - {entryDesc}";
             return status;
         }
 
@@ -131,40 +120,57 @@ public override string GetEntryFromItem((string, int) item) =>
         /// <inheritdoc/>
         public override string GetInfoFromItem((string, int) item)
         {
-            string status;
-            if (CurrentPane == 2)
-            {
-                string keyName = item.Item1;
-                int keyIdx = item.Item2;
-                string keyDesc = config.SettingsEntries[FirstPaneCurrentSelection - 1].Keys[keyIdx].Description;
-                status =
-                    $"""
-                    {keyName}
-                    ====================================================
+            string entryName = item.Item1;
+            int entryIdx = item.Item2;
+            string entryDesc = config.SettingsEntries[entryIdx].Desc;
+            string status =
+                $"""
+                {entryName}
+                ====================================================
 
-                    {keyDesc}
-                    """;
-            }
-            else
-            {
-                string entryName = item.Item1;
-                int entryIdx = item.Item2;
-                string entryDesc = config.SettingsEntries[entryIdx].Desc;
-                status =
-                    $"""
-                    {entryName}
-                    ====================================================
+                {entryDesc}
+                """;
+            return status;
+        }
+
+        /// <inheritdoc/>
+        public override string GetStatusFromItemSecondary((string, int) item)
+        {
+            string keyName = item.Item1;
+            int keyIdx = item.Item2;
+            string keyDesc = config.SettingsEntries[FirstPaneCurrentSelection - 1].Keys[keyIdx].Description;
+            string status = $"K: {keyName} - {keyDesc}";
+            return status;
+        }
+
+        /// <inheritdoc/>
+        public override string GetEntryFromItemSecondary((string, int) item) =>
+            item.Item1;
+
+        /// <inheritdoc/>
+        public override string GetInfoFromItemSecondary((string, int) item)
+        {
+            string keyName = item.Item1;
+            int keyIdx = item.Item2;
+            string keyDesc = config.SettingsEntries[FirstPaneCurrentSelection - 1].Keys[keyIdx].Description;
+            string status =
+                $"""
+                {keyName}
+                ====================================================
 
-                    {entryDesc}
-                    """;
-            }
+                {keyDesc}
+                """;
             return status;
         }
 
         internal void Set(int entryIdx, int keyIdx)
         {
             try
             {
+                // Check the pane first
+                if (CurrentPane != 2)
+                    return;
+
                 // Get the key and try to set
                 var key = config.SettingsEntries[entryIdx].Keys[keyIdx];
                 var defaultValue = ConfigTools.GetValueFromEntry(key, config);