From 940fbb0a2f6ee36f764538083607482dd291a4e0 Mon Sep 17 00:00:00 2001 From: goaaats Date: Sun, 27 Feb 2022 14:08:08 +0100 Subject: [PATCH] feat: clean up dev bar, dev button size --- .../Interface/Internal/DalamudInterface.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs index 234f583a3..ee56e749f 100644 --- a/Dalamud/Interface/Internal/DalamudInterface.cs +++ b/Dalamud/Interface/Internal/DalamudInterface.cs @@ -393,23 +393,22 @@ namespace Dalamud.Interface.Internal ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero); ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero); ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0); + ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 0); - var windowPos = ImGui.GetMainViewport().Pos + new Vector2(40); + var windowPos = ImGui.GetMainViewport().Pos + new Vector2(20); ImGui.SetNextWindowPos(windowPos, ImGuiCond.Always); ImGui.SetNextWindowBgAlpha(1); - var imageSize = new Vector2(90); - if (ImGui.Begin("DevMenu Opener", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings)) { ImGui.SetNextItemWidth(40); - if (ImGui.Button("###devMenuOpener", imageSize)) + if (ImGui.Button("###devMenuOpener", new Vector2(20, 20))) this.isImGuiDrawDevMenu = true; ImGui.End(); } - ImGui.PopStyleVar(3); + ImGui.PopStyleVar(4); ImGui.PopStyleColor(8); } } @@ -725,10 +724,14 @@ namespace Dalamud.Interface.Internal if (Service.Get().GameUiHidden) ImGui.BeginMenu("UI is hidden...", false); + ImGui.PushFont(InterfaceManager.MonoFont); + ImGui.BeginMenu(Util.GetGitHash(), false); - ImGui.BeginMenu(this.frameCount.ToString(), false); - ImGui.BeginMenu(ImGui.GetIO().Framerate.ToString("F2"), false); - ImGui.BeginMenu($"{Util.FormatBytes(GC.GetTotalMemory(false))} total managed", false); + ImGui.BeginMenu(this.frameCount.ToString("000000"), false); + ImGui.BeginMenu(ImGui.GetIO().Framerate.ToString("000"), false); + ImGui.BeginMenu($"{Util.FormatBytes(GC.GetTotalMemory(false))}", false); + + ImGui.PopFont(); ImGui.EndMainMenuBar(); }