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: comment out scrolling child for images

Browse source
This commit is contained in:
goat 2021-08-09 21:59:45 +02:00
parent d23ed9020a
commit f0fe84230c
No known key found for this signature in database
GPG key ID: F18F057873895461
1 changed files with 39 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,6 +191,8 @@ namespace Dalamud.Interface.Internal.Windows
private void DrawFooter() private void DrawFooter()
{ {
Log.Verbose(ImGui.GetWindowSize().X.ToString());
var windowSize = ImGui.GetWindowContentRegionMax(); var windowSize = ImGui.GetWindowContentRegionMax();
var placeholderButtonSize = GetButtonSize("placeholder"); var placeholderButtonSize = GetButtonSize("placeholder");
@ -562,7 +564,7 @@ namespace Dalamud.Interface.Internal.Windows
this.DrawPluginImages(manifest, index); this.DrawPluginImages(manifest, index);
ImGuiHelpers.ScaledDummy(10); ImGuiHelpers.ScaledDummy(5);
ImGui.Unindent(); ImGui.Unindent();
} }
@ -740,7 +742,7 @@ namespace Dalamud.Interface.Internal.Windows
this.DrawPluginImages(manifest, index); this.DrawPluginImages(manifest, index);
ImGuiHelpers.ScaledDummy(10); ImGuiHelpers.ScaledDummy(5);
ImGui.Unindent(); ImGui.Unindent();
} }
@ -1019,52 +1021,56 @@ namespace Dalamud.Interface.Internal.Windows
return; return;
const float thumbFactor = 2.7f; const float thumbFactor = 2.7f;
ImGui.PushStyleVar(ImGuiStyleVar.ScrollbarSize, 15);
var scrollBarSize = 15;
ImGui.PushStyleVar(ImGuiStyleVar.ScrollbarSize, scrollBarSize);
ImGui.PushStyleColor(ImGuiCol.ScrollbarBg, Vector4.Zero); ImGui.PushStyleColor(ImGuiCol.ScrollbarBg, Vector4.Zero);
if (ImGui.BeginChild($"plugin{index}ImageScrolling", new Vector2(0, (PluginImageHeight / thumbFactor) + ImGui.GetStyle().ScrollbarSize), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoBackground)) var width = ImGui.GetWindowWidth();
// TODO: This doesn't work, seems like a bug
// 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 })
{ {
if (images.Textures != null && images.Textures is { Length: > 0 }) for (var i = 0; i < images.Textures.Length; i++)
{ {
for (var i = 0; i < images.Textures.Length; i++) var popupId = $"plugin{index}image{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))
{ {
var popupId = $"plugin{index}image{i}"; if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
var image = images.Textures[i]; ImGui.CloseCurrentPopup();
ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0); ImGui.EndPopup();
ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero); }
ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
if (ImGui.BeginPopup(popupId)) ImGui.PopStyleVar(3);
{
if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
ImGui.CloseCurrentPopup();
ImGui.EndPopup(); ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
}
ImGui.PopStyleVar(3); if (ImGui.ImageButton(image.ImGuiHandle,
new Vector2(image.Width / thumbFactor, image.Height / thumbFactor)))
ImGui.OpenPopup(popupId);
ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero); ImGui.PopStyleVar();
if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width / thumbFactor, image.Height / thumbFactor))) if (i < images.Textures.Length - 1)
{ {
ImGui.OpenPopup(popupId); //ImGuiHelpers.ScaledDummy(5);
} ImGui.SameLine();
ImGui.PopStyleVar();
if (i < images.Textures.Length - 1)
{
//ImGuiHelpers.ScaledDummy(5);
ImGui.SameLine();
}
} }
} }
ImGui.EndChild();
} }
// ImGui.EndChild();
// }
ImGui.PopStyleVar(); ImGui.PopStyleVar();
ImGui.PopStyleColor(); ImGui.PopStyleColor();
} }