Skip to content

Commit

Permalink
Update version, remove method, improve text wrapping
Browse files Browse the repository at this point in the history
- Updated `_assemblyVersion` to "6.9.6.9" in `#if DEBUG` section.
- Adjusted indentation in `#else` section for consistency.
- Removed `GetNextMostRecentReleaseTag` method.
- Removed `ImGui.Separator()` call for cleaner UI.
- Replaced `ImGui.Text` with `ImGui.TextWrapped` for better text wrapping in `UiString.WelcomeWindow_FirstTime3.GetDescription()`.
- Ensured commit messages and author names use `ImGui.TextWrapped` for proper display.
  • Loading branch information
LTS-FFXIV committed Sep 7, 2024
1 parent 04285c6 commit 804ca8a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions RotationSolver/UI/WelcomeWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -149,7 +148,6 @@ public override void Draw()
}, windowWidth, textSize);
ImGui.PopFont();


ImGui.Separator(); // Separator for aesthetic or logical separation

if (!Service.Config.FirstTimeSetupDone)
Expand All @@ -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))
{
Expand Down Expand Up @@ -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();
}

Expand Down

0 comments on commit 804ca8a

Please sign in to comment.