ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 10:17:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move check for valid model to actor display instead of identifier list.

Browse source
This commit is contained in:
Ottermandias 2025-02-19 23:36:52 +01:00
parent e5b2114ac2
commit 9e7679e70f
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Glamourer/Gui/Tabs/ActorTab/ActorSelector.cs
View file

@ -91,9 +91,10 @@ public class ActorSelector(ObjectManager objects, ActorManager actors, Ephemeral
objects.Update();
_world = new WorldId(objects.Player.Valid ? objects.Player.HomeWorld : (ushort)0);
using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, _defaultItemSpacing);
var skips = ImGuiClip.GetNecessarySkips(ImGui.GetTextLineHeight());
var remainder = ImGuiClip.FilteredClippedDraw(objects.Identifiers, skips, CheckFilter, DrawSelectable);
using var style = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, _defaultItemSpacing);
var skips = ImGuiClip.GetNecessarySkips(ImGui.GetTextLineHeight());
var remainder = ImGuiClip.FilteredClippedDraw(objects.Identifiers.Where(p => p.Value.Objects.Any(a => a.Model)), skips, CheckFilter,
DrawSelectable);
ImGuiClip.DrawEndDummy(remainder, ImGui.GetTextLineHeight());
}

2
Glamourer/Interop/ObjectManager.cs
View file

@ -83,7 +83,7 @@ public class ObjectManager(
private void HandleIdentifier(ActorIdentifier identifier, Actor character)
{
if (!character.Model || !identifier.IsValid)
if (!identifier.IsValid)
return;
if (!_identifiers.TryGetValue(identifier, out var data))

2
OtterGui

@ -1 +1 @@
Subproject commit 332852ffa81387b59f260781d7e5c967f24d8be2
Subproject commit 06422a893348a18a013e6dbc558370db8d21a446