fix: adjust button bounds, force show logo in DEBUG

This commit is contained in:
goat 2021-12-06 23:00:06 +01:00
parent 4ec3673954
commit c1a38c31ce
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5

View file

@ -363,26 +363,36 @@ namespace Dalamud.Interface.Internal
ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 1)); ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 1));
ImGui.PushStyleColor(ImGuiCol.WindowBg, new Vector4(0, 0, 0, 1)); ImGui.PushStyleColor(ImGuiCol.WindowBg, new Vector4(0, 0, 0, 1));
var mainViewportPos = ImGui.GetMainViewport().Pos; ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
ImGui.SetNextWindowPos(new Vector2(mainViewportPos.X, mainViewportPos.Y), ImGuiCond.Always); ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
var windowPos = ImGui.GetMainViewport().Pos + new Vector2(40);
ImGui.SetNextWindowPos(windowPos, ImGuiCond.Always);
ImGui.SetNextWindowBgAlpha(1); 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)) if (ImGui.Begin("DevMenu Opener", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
{ {
if (ImGui.Button("###devMenuOpener", new Vector2(40, 25))) var cursor = ImGui.GetCursorPos();
if (ImGui.Button("###devMenuOpener", imageSize))
this.isImGuiDrawDevMenu = true; this.isImGuiDrawDevMenu = true;
#if !DEBUG
if (config.DoDalamudTest) if (config.DoDalamudTest)
{ {
ImGuiHelpers.ScaledDummy(20); #endif
ImGuiHelpers.ScaledDummy(20); ImGui.SetCursorPos(cursor);
ImGui.SameLine(); ImGui.Image(this.logoTexture.ImGuiHandle, imageSize);
ImGui.Image(this.logoTexture.ImGuiHandle, new Vector2(25, 25)); #if !DEBUG
} }
#endif
ImGui.End(); ImGui.End();
} }
ImGui.PopStyleVar(3);
ImGui.PopStyleColor(8); ImGui.PopStyleColor(8);
} }
} }