diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs index 1c0d3fa02..45ad215d4 100644 --- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs @@ -175,7 +175,7 @@ internal sealed class ChangelogWindow : Window, IDisposable ImGui.Dummy(new Vector2(dummySize)); ImGui.SameLine(); - var logoContainerSize = new Vector2(this.Size!.Value.X * 0.2f - dummySize, this.Size!.Value.Y); + var logoContainerSize = new Vector2(windowSize.X * 0.2f - dummySize, windowSize.Y); using (var child = ImRaii.Child("###logoContainer", logoContainerSize, false)) { if (!child) @@ -196,7 +196,7 @@ internal sealed class ChangelogWindow : Window, IDisposable ImGui.Dummy(new Vector2(dummySize)); ImGui.SameLine(); - using (var child = ImRaii.Child("###textContainer", new Vector2((this.Size!.Value.X * 0.8f) - dummySize * 4, this.Size!.Value.Y), false)) + using (var child = ImRaii.Child("###textContainer", new Vector2((windowSize.X * 0.8f) - dummySize * 4, windowSize.Y), false)) { if (!child) return; @@ -351,7 +351,7 @@ internal sealed class ChangelogWindow : Window, IDisposable var childSize = ImGui.GetWindowSize(); var closeButtonSize = 15 * ImGuiHelpers.GlobalScale; - ImGui.SetCursorPos(new Vector2(childSize.X - closeButtonSize - (5 * ImGuiHelpers.GlobalScale), 10 * ImGuiHelpers.GlobalScale)); + ImGui.SetCursorPos(new Vector2(childSize.X - closeButtonSize - 5, 10 * ImGuiHelpers.GlobalScale)); if (ImGuiComponents.IconButton(FontAwesomeIcon.Times)) { Dismiss(); @@ -360,9 +360,11 @@ internal sealed class ChangelogWindow : Window, IDisposable ImGui.PopStyleColor(2); ImGui.PopStyleVar(); - + if (ImGui.IsItemHovered()) + { ImGui.SetTooltip("I don't care about this"); + } } } diff --git a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs index fe3c25784..6bb8ea25e 100644 --- a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs @@ -145,7 +145,7 @@ internal class ConsoleWindow : Window, IDisposable this.DrawFilterToolbar(); - ImGui.BeginChild("scrolling", new Vector2(0, ImGui.GetFrameHeightWithSpacing() - 55), false, ImGuiWindowFlags.AlwaysHorizontalScrollbar | ImGuiWindowFlags.AlwaysVerticalScrollbar); + ImGui.BeginChild("scrolling", new Vector2(0, ImGui.GetFrameHeightWithSpacing() - 55 * ImGuiHelpers.GlobalScale), false, ImGuiWindowFlags.AlwaysHorizontalScrollbar | ImGuiWindowFlags.AlwaysVerticalScrollbar); if (this.clearLog) this.Clear(); @@ -268,11 +268,9 @@ internal class ConsoleWindow : Window, IDisposable } ImGui.SetItemDefaultFocus(); - if (getFocus) - ImGui.SetKeyboardFocusHere(-1); // Auto focus previous widget + if (getFocus) ImGui.SetKeyboardFocusHere(-1); // Auto focus previous widget - if (hadColor) - ImGui.PopStyleColor(); + if (hadColor) ImGui.PopStyleColor(); if (ImGui.Button("Send", ImGuiHelpers.ScaledVector2(80.0f, 23.0f))) {