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

Normalize names

Browse source
This commit is contained in:
Soreepeong 2024-02-28 01:09:07 +09:00
parent a4a990cf3d
commit a1e2473774
2 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Interface/ImGuiNotification/NotificationUtilities.cs
View file

@ -19,17 +19,17 @@ public static class NotificationUtilities
{ {
/// <inheritdoc cref="INotificationIcon.From(SeIconChar)"/> /// <inheritdoc cref="INotificationIcon.From(SeIconChar)"/>
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static INotificationIcon ToIconSource(this SeIconChar iconChar) => public static INotificationIcon ToNotificationIcon(this SeIconChar iconChar) =>
INotificationIcon.From(iconChar); INotificationIcon.From(iconChar);
/// <inheritdoc cref="INotificationIcon.From(FontAwesomeIcon)"/> /// <inheritdoc cref="INotificationIcon.From(FontAwesomeIcon)"/>
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static INotificationIcon ToIconSource(this FontAwesomeIcon iconChar) => public static INotificationIcon ToNotificationIcon(this FontAwesomeIcon iconChar) =>
INotificationIcon.From(iconChar); INotificationIcon.From(iconChar);
/// <inheritdoc cref="INotificationIcon.FromFile(string)"/> /// <inheritdoc cref="INotificationIcon.FromFile(string)"/>
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static INotificationIcon ToIconSource(this FileInfo fileInfo) => public static INotificationIcon ToNotificationIcon(this FileInfo fileInfo) =>
INotificationIcon.FromFile(fileInfo.FullName); INotificationIcon.FromFile(fileInfo.FullName);
/// <summary>Draws an icon from an <see cref="IFontHandle"/> and a <see cref="char"/>.</summary> /// <summary>Draws an icon from an <see cref="IFontHandle"/> and a <see cref="char"/>.</summary>

62
Dalamud/Interface/Internal/Windows/Data/Widgets/ImGuiWidget.cs
View file

@ -76,35 +76,35 @@ internal class ImGuiWidget : IDataWindowWidget
NotificationTemplate.TypeTitles.Length); NotificationTemplate.TypeTitles.Length);
ImGui.Combo( ImGui.Combo(
"Icon Source##iconSourceCombo", "Icon##iconCombo",
ref this.notificationTemplate.IconSourceInt, ref this.notificationTemplate.IconInt,
NotificationTemplate.IconSourceTitles, NotificationTemplate.IconTitles,
NotificationTemplate.IconSourceTitles.Length); NotificationTemplate.IconTitles.Length);
switch (this.notificationTemplate.IconSourceInt) switch (this.notificationTemplate.IconInt)
{ {
case 1 or 2: case 1 or 2:
ImGui.InputText( ImGui.InputText(
"Icon Text##iconSourceText", "Icon Text##iconText",
ref this.notificationTemplate.IconSourceText, ref this.notificationTemplate.IconText,
255); 255);
break; break;
case 3 or 4: case 3 or 4:
ImGui.Combo( ImGui.Combo(
"Icon Source##iconSourceAssetCombo", "Asset##iconAssetCombo",
ref this.notificationTemplate.IconSourceAssetInt, ref this.notificationTemplate.IconAssetInt,
NotificationTemplate.AssetSources, NotificationTemplate.AssetSources,
NotificationTemplate.AssetSources.Length); NotificationTemplate.AssetSources.Length);
break; break;
case 5 or 7: case 5 or 7:
ImGui.InputText( ImGui.InputText(
"Game Path##iconSourceText", "Game Path##iconText",
ref this.notificationTemplate.IconSourceText, ref this.notificationTemplate.IconText,
255); 255);
break; break;
case 6 or 8: case 6 or 8:
ImGui.InputText( ImGui.InputText(
"File Path##iconSourceText", "File Path##iconText",
ref this.notificationTemplate.IconSourceText, ref this.notificationTemplate.IconText,
255); 255);
break; break;
} }
@ -179,37 +179,37 @@ internal class ImGuiWidget : IDataWindowWidget
4 => -1f, 4 => -1f,
_ => 0.5f, _ => 0.5f,
}, },
Icon = this.notificationTemplate.IconSourceInt switch Icon = this.notificationTemplate.IconInt switch
{ {
1 => INotificationIcon.From( 1 => INotificationIcon.From(
(SeIconChar)(this.notificationTemplate.IconSourceText.Length == 0 (SeIconChar)(this.notificationTemplate.IconText.Length == 0
? 0 ? 0
: this.notificationTemplate.IconSourceText[0])), : this.notificationTemplate.IconText[0])),
2 => INotificationIcon.From( 2 => INotificationIcon.From(
(FontAwesomeIcon)(this.notificationTemplate.IconSourceText.Length == 0 (FontAwesomeIcon)(this.notificationTemplate.IconText.Length == 0
? 0 ? 0
: this.notificationTemplate.IconSourceText[0])), : this.notificationTemplate.IconText[0])),
3 => INotificationIcon.FromGame(this.notificationTemplate.IconSourceText), 3 => INotificationIcon.FromGame(this.notificationTemplate.IconText),
4 => INotificationIcon.FromFile(this.notificationTemplate.IconSourceText), 4 => INotificationIcon.FromFile(this.notificationTemplate.IconText),
_ => null, _ => null,
}, },
}); });
var dam = Service<DalamudAssetManager>.Get(); var dam = Service<DalamudAssetManager>.Get();
var tm = Service<TextureManager>.Get(); var tm = Service<TextureManager>.Get();
switch (this.notificationTemplate.IconSourceInt) switch (this.notificationTemplate.IconInt)
{ {
case 5: case 5:
n.SetIconTexture( n.SetIconTexture(
dam.GetDalamudTextureWrap( dam.GetDalamudTextureWrap(
Enum.Parse<DalamudAsset>( Enum.Parse<DalamudAsset>(
NotificationTemplate.AssetSources[this.notificationTemplate.IconSourceAssetInt]))); NotificationTemplate.AssetSources[this.notificationTemplate.IconAssetInt])));
break; break;
case 6: case 6:
n.SetIconTexture(tm.GetTextureFromGame(this.notificationTemplate.IconSourceText)); n.SetIconTexture(tm.GetTextureFromGame(this.notificationTemplate.IconText));
break; break;
case 7: case 7:
n.SetIconTexture(tm.GetTextureFromFile(new(this.notificationTemplate.IconSourceText))); n.SetIconTexture(tm.GetTextureFromFile(new(this.notificationTemplate.IconText)));
break; break;
} }
@ -307,7 +307,7 @@ internal class ImGuiWidget : IDataWindowWidget
private struct NotificationTemplate private struct NotificationTemplate
{ {
public static readonly string[] IconSourceTitles = public static readonly string[] IconTitles =
{ {
"None (use Type)", "None (use Type)",
"SeIconChar", "SeIconChar",
@ -373,9 +373,9 @@ internal class ImGuiWidget : IDataWindowWidget
public string Title; public string Title;
public bool ManualMinimizedText; public bool ManualMinimizedText;
public string MinimizedText; public string MinimizedText;
public int IconSourceInt; public int IconInt;
public string IconSourceText; public string IconText;
public int IconSourceAssetInt; public int IconAssetInt;
public bool ManualType; public bool ManualType;
public int TypeInt; public int TypeInt;
public int InitialDurationInt; public int InitialDurationInt;
@ -394,9 +394,9 @@ internal class ImGuiWidget : IDataWindowWidget
this.Title = string.Empty; this.Title = string.Empty;
this.ManualMinimizedText = false; this.ManualMinimizedText = false;
this.MinimizedText = string.Empty; this.MinimizedText = string.Empty;
this.IconSourceInt = 0; this.IconInt = 0;
this.IconSourceText = "ui/icon/000000/000004_hr1.tex"; this.IconText = "ui/icon/000000/000004_hr1.tex";
this.IconSourceAssetInt = 0; this.IconAssetInt = 0;
this.ManualType = false; this.ManualType = false;
this.TypeInt = (int)NotificationType.None; this.TypeInt = (int)NotificationType.None;
this.InitialDurationInt = 2; this.InitialDurationInt = 2;