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

merge

Browse source
This commit is contained in:
goaaats 2022-01-31 18:25:57 +01:00
commit 42f1cb63e0
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/IoC/PluginServiceAttribute.cs
View file

@ -1,11 +1,14 @@
using System; using System;
using JetBrains.Annotations;
namespace Dalamud.IoC namespace Dalamud.IoC
{ {
/// <summary> /// <summary>
/// This attribute indicates whether an applicable service should be injected into the plugin. /// This attribute indicates whether an applicable service should be injected into the plugin.
/// </summary> /// </summary>
[AttributeUsage(AttributeTargets.Property)] [AttributeUsage(AttributeTargets.Property)]
[MeansImplicitUse(ImplicitUseKindFlags.Assign)]
public class PluginServiceAttribute : Attribute public class PluginServiceAttribute : Attribute
{ {
} }

4
Dalamud/Utility/Util.cs
View file

@ -279,7 +279,7 @@ namespace Dalamud.Utility
ShowValue(addr, new List<string>(path) { f.Name }, f.FieldType, f.GetValue(obj)); ShowValue(addr, new List<string>(path) { f.Name }, f.FieldType, f.GetValue(obj));
} }
foreach (var p in obj.GetType().GetProperties()) foreach (var p in obj.GetType().GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
{ {
ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{p.PropertyType.Name}"); ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{p.PropertyType.Name}");
ImGui.SameLine(); ImGui.SameLine();
@ -347,7 +347,7 @@ namespace Dalamud.Utility
ImGui.Indent(); ImGui.Indent();
foreach (var propertyInfo in type.GetProperties()) foreach (var propertyInfo in type.GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
{ {
var value = propertyInfo.GetValue(obj); var value = propertyInfo.GetValue(obj);
var valueType = value?.GetType(); var valueType = value?.GetType();