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

fix: TSM not interactable when animating

Browse source
This commit is contained in:
goaaats 2023-01-08 00:15:04 +01:00
parent c7215c25a5
commit bb6109db45
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
View file

@ -134,7 +134,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
pos = finalPos; pos = finalPos;
} }
this.DrawEntry(entry, moveEasing.IsRunning && i != 0, true, i == 0, true); this.DrawEntry(entry, moveEasing.IsRunning && i != 0, true, i == 0, true, moveEasing.IsDone);
var cursor = ImGui.GetCursorPos(); var cursor = ImGui.GetCursorPos();
cursor.Y = (float)pos; cursor.Y = (float)pos;
@ -177,7 +177,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
var finalPos = (i + 1) * this.shadeTexture.Height * scale; var finalPos = (i + 1) * this.shadeTexture.Height * scale;
this.DrawEntry(entry, i != 0, true, i == 0, false); this.DrawEntry(entry, i != 0, true, i == 0, false, false);
var cursor = ImGui.GetCursorPos(); var cursor = ImGui.GetCursorPos();
cursor.Y = finalPos; cursor.Y = finalPos;
@ -205,7 +205,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
case State.Hide: case State.Hide:
{ {
if (this.DrawEntry(tsm.Entries[0], true, false, true, true)) if (this.DrawEntry(tsm.Entries[0], true, false, true, true, false))
{ {
this.state = State.Show; this.state = State.Show;
} }
@ -228,7 +228,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
} }
private bool DrawEntry( private bool DrawEntry(
TitleScreenMenu.TitleScreenMenuEntry entry, bool inhibitFadeout, bool showText, bool isFirst, bool overrideAlpha) TitleScreenMenu.TitleScreenMenuEntry entry, bool inhibitFadeout, bool showText, bool isFirst, bool overrideAlpha, bool interactable)
{ {
InterfaceManager.SpecialGlyphRequest fontHandle; InterfaceManager.SpecialGlyphRequest fontHandle;
if (this.specialGlyphRequests.TryGetValue(entry.Name, out fontHandle) && fontHandle.Size != TargetFontSizePx) if (this.specialGlyphRequests.TryGetValue(entry.Name, out fontHandle) && fontHandle.Size != TargetFontSizePx)
@ -271,7 +271,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
} }
var isClick = ImGui.IsItemClicked(); var isClick = ImGui.IsItemClicked();
if (isClick) if (isClick && interactable)
{ {
entry.Trigger(); entry.Trigger();
} }