Merge pull request #338 from FFXIV-CombatReborn/welcome-screen-fixes

Update version, remove method, improve text wrapping
FFXIV-CombatReborn · Sep 7, 2024 · 7425817 · 7425817
2 parents 04285c6 + 804ca8a
commit 7425817
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/RotationSolver/UI/WelcomeWindow.cs b/RotationSolver/UI/WelcomeWindow.cs
@@ -23,9 +23,9 @@ public WelcomeWindow() : base($"Welcome to Rotation Solver Reborn!", BaseFlags)
         private const ImGuiWindowFlags BaseFlags = ImGuiWindowFlags.NoCollapse
                                     | ImGuiWindowFlags.NoSavedSettings;
 #if DEBUG
-        private string _assemblyVersion = "4.0.5.5";
+        private string _assemblyVersion = "6.9.6.9"; //kekw
 #else
-        private string _assemblyVersion = typeof(RotationConfigWindow).Assembly.GetName().Version?.ToString() ?? "4.0.5.4";
+            private string _assemblyVersion = typeof(RotationConfigWindow).Assembly.GetName().Version?.ToString() ?? "4.0.5.4";
 #endif
 
         private string _lastSeenChangelog = Service.Config.LastSeenChangelog;
@@ -73,7 +73,6 @@ private async Task GetGithubComparison()
             }
         }
 
-
         private async Task<string> GetNextMostRecentReleaseTag()
         {
             var url = $"https://api.github.com/repos/{Service.USERNAME}/{Service.REPO}/releases";
@@ -149,7 +148,6 @@ public override void Draw()
             }, windowWidth, textSize);
             ImGui.PopFont();
 
-
             ImGui.Separator();  // Separator for aesthetic or logical separation
 
             if (!Service.Config.FirstTimeSetupDone)
@@ -163,7 +161,7 @@ public override void Draw()
                 ImGui.PopFont();
 
                 text = UiString.WelcomeWindow_FirstTime3.GetDescription();
-                ImGui.Text(text);
+                ImGui.TextWrapped(text);
                 var autoUpdate = Service.Config.AutoLoadRotations.Value;
                 if (ImGui.Checkbox(UiString.WelcomeWindow_LoadAtStartup.GetDescription(), ref autoUpdate))
                 {
@@ -237,13 +235,12 @@ private void DrawChangeLog()
             ImGui.PopFont();
             foreach (var commit in commits)
             {
-
                 ImGui.Text($"[{commit.CommitData.CommitAuthor.Date:yyyy-MM-dd}]");
 
                 ImGui.Indent();
-                ImGui.Text($"- {commit.CommitData.Message}");
+                ImGui.TextWrapped($"- {commit.CommitData.Message}");
 
-                ImGui.Text($"By: @{commit.CommitData.CommitAuthor.Name}");
+                ImGui.TextWrapped($"By: @{commit.CommitData.CommitAuthor.Name}");
                 ImGui.Unindent();
             }