diff --git a/Dalamud.Injector/Dalamud.Injector.csproj b/Dalamud.Injector/Dalamud.Injector.csproj index 37fbd4bc3..a1bb81edf 100644 --- a/Dalamud.Injector/Dalamud.Injector.csproj +++ b/Dalamud.Injector/Dalamud.Injector.csproj @@ -24,6 +24,9 @@ false + + + dalamud.ico diff --git a/Dalamud.Injector/dalamud.ico b/Dalamud.Injector/dalamud.ico new file mode 100644 index 000000000..98b9a9b9f Binary files /dev/null and b/Dalamud.Injector/dalamud.ico differ diff --git a/Dalamud/Interface/DalamudCreditsWindow.cs b/Dalamud/Interface/DalamudCreditsWindow.cs index 972910247..6219aa7e5 100644 --- a/Dalamud/Interface/DalamudCreditsWindow.cs +++ b/Dalamud/Interface/DalamudCreditsWindow.cs @@ -8,31 +8,46 @@ namespace Dalamud.Interface { class DalamudCreditsWindow : IDisposable { private string creditsText = @" - Dalamud - A FFXIV Hooking Framework +Dalamud +A FFXIV Hooking Framework - created by: +created by: - goat - Mino - Meli - attick - Aida-Enna - perchbird - Wintermute +goat +Mino +Meli +attick +Aida-Enna +perchbird +Wintermute - Special thanks: - Adam - karashiiro - Kubera - Truci - Haplo +Logo by: - Everyone in the XIVLauncher Discord server +gucciBane + + + +Special thanks: + +Adam +karashiiro +Kubera +Truci +Haplo + +Everyone in the XIVLauncher Discord server + + + +Licensed under AGPL +Read the code: https://github.com/goaaats/Dalamud + + +Thank you for using XIVLauncher! "; private TextureWrap logoTexture; @@ -42,7 +57,7 @@ namespace Dalamud.Interface this.logoTexture = logoTexture; this.framework = framework; - framework.Gui.SetBgm(726); + framework.Gui.SetBgm(132); } public void Dispose() { @@ -50,7 +65,11 @@ namespace Dalamud.Interface } public bool Draw() { - ImGui.SetNextWindowSize(new Vector2(500, 400), ImGuiCond.FirstUseEver); + var windowSize = new Vector2(500, 400); + ImGui.SetNextWindowSize(windowSize, ImGuiCond.Always); + + var screenSize = ImGui.GetIO().DisplaySize; + ImGui.SetNextWindowPos(new Vector2((screenSize.X / 2) - windowSize.X /2, (screenSize.Y / 2) - windowSize.Y / 2), ImGuiCond.Always); var isOpen = true; @@ -66,19 +85,27 @@ namespace Dalamud.Interface ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 0)); - ImGui.Dummy(new Vector2(0, 60f)); + ImGui.Dummy(new Vector2(0, 340f)); ImGui.Text(""); ImGui.SameLine(150f); - ImGui.Image(this.logoTexture.ImGuiHandle, new Vector2(150f, 150f)); + ImGui.Image(this.logoTexture.ImGuiHandle, new Vector2(190f, 190f)); ImGui.Dummy(new Vector2(0, 20f)); - ImGui.TextUnformatted(this.creditsText); + var windowX = ImGui.GetWindowSize().X; + + foreach (var creditsLine in this.creditsText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None)) { + var lineLenX = ImGui.CalcTextSize(creditsLine).X; + + ImGui.Dummy(new Vector2((windowX / 2) - lineLenX / 2, 0f)); + ImGui.SameLine(); + ImGui.TextUnformatted(creditsLine); + } ImGui.PopStyleVar(); - if (ImGui.GetScrollY() < ImGui.GetScrollMaxY()) + if (ImGui.GetScrollY() < ImGui.GetScrollMaxY() - 0.2f) ImGui.SetScrollY(ImGui.GetScrollY() + 0.2f); ImGui.EndChild(); diff --git a/Dalamud/UIRes/77240429-37533100-6bab-11ea-9ad6-69c99e0bc4f9.png b/Dalamud/UIRes/77240429-37533100-6bab-11ea-9ad6-69c99e0bc4f9.png new file mode 100644 index 000000000..143b1f8b1 Binary files /dev/null and b/Dalamud/UIRes/77240429-37533100-6bab-11ea-9ad6-69c99e0bc4f9.png differ diff --git a/Dalamud/UIRes/logo.png b/Dalamud/UIRes/logo.png index 1a7a1b7e8..5b118df26 100644 Binary files a/Dalamud/UIRes/logo.png and b/Dalamud/UIRes/logo.png differ