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

Merge remote-tracking branch 'origin/master' into v9-rollup

Browse source
This commit is contained in:
github-actions[bot] 2023-09-10 21:53:08 +00:00
commit 38a4a7f580
36 changed files with 1336 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,16 +98,17 @@ internal class TitleScreenMenuWindow : Window, IDisposable
public override void Draw()
{
var scale = ImGui.GetIO().FontGlobalScale;
var tsm = Service<TitleScreenMenu>.Get();
var entries = Service<TitleScreenMenu>.Get().Entries
.OrderByDescending(x => x.IsInternal)
.ToList();
switch (this.state)
{
case State.Show:
{
for (var i = 0; i < tsm.Entries.Count; i++)
for (var i = 0; i < entries.Count; i++)
{
var entry = tsm.Entries[i];
var entry = entries[i];
if (!this.moveEasings.TryGetValue(entry.Id, out var moveEasing))
{
@ -173,9 +174,9 @@ internal class TitleScreenMenuWindow : Window, IDisposable
using (ImRaii.PushStyle(ImGuiStyleVar.Alpha, (float)this.fadeOutEasing.Value))
{
for (var i = 0; i < tsm.Entries.Count; i++)
for (var i = 0; i < entries.Count; i++)
{
var entry = tsm.Entries[i];
var entry = entries[i];
var finalPos = (i + 1) * this.shadeTexture.Height * scale;
@ -206,7 +207,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
case State.Hide:
{
if (this.DrawEntry(tsm.Entries[0], true, false, true, true, false))
if (this.DrawEntry(entries[0], true, false, true, true, false))
{
this.state = State.Show;
}
@ -218,7 +219,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
}
}
var srcText = tsm.Entries.Select(e => e.Name).ToHashSet();
var srcText = entries.Select(e => e.Name).ToHashSet();
var keys = this.specialGlyphRequests.Keys.ToHashSet();
keys.RemoveWhere(x => srcText.Contains(x));
foreach (var key in keys)