From 4ec3673954f282e3abeb65ebc238ef3b12d1efdb Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Mon, 6 Dec 2021 20:14:25 +0100
Subject: [PATCH] feat: show logo instead of ugly scaled text for testing
---
Dalamud/Interface/Internal/DalamudInterface.cs | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index 4c51d108f..067ae285b 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -1,6 +1,7 @@
using System;
using System.Diagnostics;
using System.Globalization;
+using System.IO;
using System.Linq;
using System.Numerics;
using System.Reflection;
@@ -24,6 +25,7 @@ using Dalamud.Utility;
using FFXIVClientStructs.FFXIV.Client.System.Framework;
using FFXIVClientStructs.FFXIV.Client.UI;
using ImGuiNET;
+using ImGuiScene;
using PInvoke;
using Serilog.Events;
@@ -61,6 +63,8 @@ namespace Dalamud.Interface.Internal
private bool isImGuiDrawDemoWindow = false;
private bool isImGuiDrawMetricsWindow = false;
+ private readonly TextureWrap logoTexture;
+
///
/// Initializes a new instance of the class.
///
@@ -100,7 +104,12 @@ namespace Dalamud.Interface.Internal
ImGuiManagedAsserts.AssertsEnabled = configuration.AssertsEnabledAtStartup;
- Service.Get().Draw += this.OnDraw;
+ var interfaceManager = Service.Get();
+ interfaceManager.Draw += this.OnDraw;
+ var dalamud = Service.Get();
+
+ this.logoTexture =
+ interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"))!;
}
///
@@ -122,6 +131,8 @@ namespace Dalamud.Interface.Internal
{
Service.Get().Draw -= this.OnDraw;
+ this.logoTexture.Dispose();
+
this.WindowSystem.RemoveAllWindows();
this.creditsWindow.Dispose();
@@ -363,11 +374,10 @@ namespace Dalamud.Interface.Internal
if (config.DoDalamudTest)
{
- ImGui.SetWindowFontScale(2.2f);
ImGuiHelpers.ScaledDummy(20);
ImGuiHelpers.ScaledDummy(20);
ImGui.SameLine();
- ImGui.TextColored(ImGuiColors.DPSRed, "Dalamud Staging");
+ ImGui.Image(this.logoTexture.ImGuiHandle, new Vector2(25, 25));
}
ImGui.End();