ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: plugin images in children (closes #482)

Browse source
This commit is contained in:
goat 2021-08-17 13:50:00 +02:00
parent adbf9b2bb0
commit ee03864c70
No known key found for this signature in database
GPG key ID: F18F057873895461
1 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -1212,48 +1212,47 @@ namespace Dalamud.Interface.Internal.Windows
var width = ImGui.GetWindowWidth(); var width = ImGui.GetWindowWidth();
// TODO: This doesn't work, seems like a bug if (ImGui.BeginChild($"plugin{index}ImageScrolling", new Vector2(width - (70 * ImGuiHelpers.GlobalScale), (PluginImageHeight / thumbFactor) + scrollBarSize), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoBackground))
// if (ImGui.BeginChild($"plugin{index}ImageScrolling", new Vector2(width, (PluginImageHeight / thumbFactor) + scrollBarSize), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoBackground))
// {
if (images.Textures != null && images.Textures is { Length: > 0 })
{ {
for (var i = 0; i < images.Textures.Length; i++) if (images.Textures != null && images.Textures is { Length: > 0 })
{ {
var popupId = $"plugin{index}image{i}"; for (var i = 0; i < images.Textures.Length; i++)
var image = images.Textures[i];
ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0);
ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
if (ImGui.BeginPopup(popupId))
{ {
if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height))) var popupId = $"plugin{index}image{i}";
ImGui.CloseCurrentPopup(); var image = images.Textures[i];
ImGui.EndPopup(); ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0);
} ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
ImGui.PopStyleVar(3); if (ImGui.BeginPopup(popupId))
{
if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
ImGui.CloseCurrentPopup();
ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero); ImGui.EndPopup();
}
if (ImGui.ImageButton(image.ImGuiHandle, ImGuiHelpers.ScaledVector2(image.Width / thumbFactor, image.Height / thumbFactor))) ImGui.PopStyleVar(3);
ImGui.OpenPopup(popupId);
ImGui.PopStyleVar(); ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
if (i < images.Textures.Length - 1) if (ImGui.ImageButton(image.ImGuiHandle, ImGuiHelpers.ScaledVector2(image.Width / thumbFactor, image.Height / thumbFactor)))
{ ImGui.OpenPopup(popupId);
ImGui.SameLine();
ImGuiHelpers.ScaledDummy(5); ImGui.PopStyleVar();
ImGui.SameLine();
if (i < images.Textures.Length - 1)
{
ImGui.SameLine();
ImGuiHelpers.ScaledDummy(5);
ImGui.SameLine();
}
} }
} }
} }
// ImGui.EndChild(); ImGui.EndChild();
// }
ImGui.PopStyleVar(); ImGui.PopStyleVar();
ImGui.PopStyleColor(); ImGui.PopStyleColor();