Add option to toggle table columns

Vanawy · Mar 24, 2024 · 49cd2e0 · 49cd2e0
1 parent f4f62b9
commit 49cd2e0
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 37 deletions.
diff --git a/src/history_table.as b/src/history_table.as
@@ -49,33 +49,64 @@ class HistoryTable
 
     void Render(Target @target) 
     {
+        // uint numCols = 6;
+
+        uint numCols = 
+            (settingColumnShowRunId ? 1 : 0) +
+            (settingColumnShowMedal ? 1 : 0) +
+            (settingColumnShowTime ? 1 : 0) +
+            (settingColumnShowDelta ? 1 : 0) +
+            (settingColumnShowPBImprovment ? 1 : 0) +
+            (settingColumnShowNoRespawnTime ? 1 : 0);
+
+        if (numCols < 1) {
+            return;
+        }
+
+
         UI::BeginGroup();
-        uint numCols = 6; 
+
         if(UI::BeginTable(TEXT_PLUGIN_NAME, numCols, UI::TableFlags::SizingFixedFit)) {
 
             // print(targets.Length);
             UI::TableNextRow();
-            UI::TableNextColumn();
-
-            string text = "";
+            string formattedTime = "";
+            string icon = "";
             if (@target != null && target.time > 0) {
-                UI::Text(target.icon);
-                text = "\\$fff" + Time::Format(target.time);
+                icon = target.icon;
+                formattedTime = "\\$fff" + Time::Format(target.time);
             } else {
-                UI::Text(Icons::Spinner);
-                text = "-:--.---";
+                icon = Icons::Spinner;
+                formattedTime = "-:--.---";
+            }
+            if (settingColumnShowRunId) {
+                UI::TableNextColumn();
+                UI::Text(icon);
+            }
+            if (settingColumnShowMedal) {
+                UI::TableNextColumn();
+                if (settingColumnShowRunId) {
+                    UI::Text(ICON_MEDAL);
+                } else {
+                    UI::Text(icon);
+                }
+            }
+            if (settingColumnShowTime) {
+                UI::TableNextColumn();
+                UI::Text(formattedTime);
+            }
+            if (settingColumnShowDelta) {
+                UI::TableNextColumn();
+                UI::Text(Icons::Flag);
+            }
+            if (settingColumnShowPBImprovment) {
+                UI::TableNextColumn();
+                UI::Text(COLOR_PB + Icons::ChevronUp);
+            }
+            if (settingColumnShowNoRespawnTime) {
+                UI::TableNextColumn();
+                UI::Text(ICON_NORESPAWN);
             }
-
-            UI::TableNextColumn();
-            UI::Text(ICON_MEDAL);
-            UI::TableNextColumn();
-            UI::Text(text);
-            UI::TableNextColumn();
-            UI::Text(Icons::Flag);
-            UI::TableNextColumn();
-            UI::Text(COLOR_PB + Icons::ChevronUp);
-            UI::TableNextColumn();
-            UI::Text(ICON_NORESPAWN);
 
             UI::TableNextRow();
             for(uint i = 0; i < numCols; i++) {
@@ -88,26 +119,36 @@ class HistoryTable
                 if(run.hidden) {
                     continue;
                 }
-                UI::TableNextRow();
-
-                UI::TableNextColumn();
-                UI::Text("" + (i + 1));
-
-                UI::TableNextColumn();
-                UI::Text(run.beaten.icon);
 
-                UI::TableNextColumn();
-                UI::Text("\\$fff" + Time::Format(run.time));
+                UI::TableNextRow();
 
-                UI::TableNextColumn();
-                run.DrawDelta();
-                UI::TableNextColumn();
-                run.DrawPBImprovment();
-                UI::TableNextColumn();
-                if (run.noRespawnTime > 0) {
-                    UI::Text(run.noRespawn.color + Time::Format(run.noRespawnTime));
+                if (settingColumnShowRunId) {
+                    UI::TableNextColumn();
+                    UI::Text("" + (i + 1));
+                }
+                if (settingColumnShowMedal) {
+                    UI::TableNextColumn();
+                    UI::Text(run.beaten.icon);
+                }
+                if (settingColumnShowTime) {
+                    UI::TableNextColumn();
+                    UI::Text("\\$fff" + Time::Format(run.time));
                 }
-            };
+                if (settingColumnShowDelta) {
+                    UI::TableNextColumn();
+                    run.DrawDelta();
+                }
+                if (settingColumnShowPBImprovment) {
+                    UI::TableNextColumn();
+                    run.DrawPBImprovment();
+                }
+                if (settingColumnShowNoRespawnTime) {
+                    UI::TableNextColumn();
+                    if (run.noRespawnTime > 0) {
+                        UI::Text(run.noRespawn.color + Time::Format(run.noRespawnTime));
+                    }
+                }
+            }
             UI::EndTable();
         }
         UI::EndGroup();

diff --git a/src/main.as b/src/main.as
@@ -89,6 +89,10 @@ void Render()
         return;
     }
 
+    if (settingWindowHide) {
+        return;
+    }
+
     if (settingWindowHideWithOverlay && !UI::IsOverlayShown()) {
         return;
     }
@@ -180,7 +184,7 @@ void RenderAddTargetPopup()
 
 void RenderActions()
 {
-    if (!UI::IsOverlayShown()) return;
+    if (!UI::IsOverlayShown() || settingUseHideButtons) return;
 
     // UI::Columns(1);
     if (UI::Button(settingUseSmallButtons ? ICON_CLEAR : TEXT_CLEAR)) {

diff --git a/src/settings.as b/src/settings.as
@@ -14,8 +14,26 @@ vec2 settingWindowAnchor = vec2(0, 170);
 bool settingWindowLockPosition = false;
 [Setting category="Display" name="Hide with overlay"]
 bool settingWindowHideWithOverlay = false;
+[Setting category="Display" name="Hide window"]
+bool settingWindowHide = false;
 [Setting category="Display" name="Small action buttons"]
 bool settingUseSmallButtons = true;
+[Setting category="Display" name="Hide action buttons"]
+bool settingUseHideButtons = false;
+
+
+[Setting category="Columns" name="Run number"]
+bool settingColumnShowRunId = true;
+[Setting category="Columns" name="Medal"]
+bool settingColumnShowMedal = false;
+[Setting category="Columns" name="Time"]
+bool settingColumnShowTime = true;
+[Setting category="Columns" name="Target Delta"]
+bool settingColumnShowDelta = true;
+[Setting category="Columns" name="PB Improvment"]
+bool settingColumnShowPBImprovment = false;
+[Setting category="Columns" name="No Respawn Time"]
+bool settingColumnShowNoRespawnTime = true;
 
 [Setting hidden]
 string settingDeltasSerialized = DEFAULT_DELTAS;