diff --git a/Dalamud/DalamudAsset.cs b/Dalamud/DalamudAsset.cs index 0dbd4cef1..07f0c0f0a 100644 --- a/Dalamud/DalamudAsset.cs +++ b/Dalamud/DalamudAsset.cs @@ -130,7 +130,8 @@ public enum DalamudAsset [DalamudAsset(DalamudAssetPurpose.Font)] [DalamudAssetPath("UIRes", "NotoSansCJK-Medium.ttc")] NotoSansCJKMedium = 2000, - + + /// /// : Atlas containing badges. /// [DalamudAsset(DalamudAssetPurpose.TextureFromPng)] diff --git a/Dalamud/Interface/FontIdentifier/IFontSpec.cs b/Dalamud/Interface/FontIdentifier/IFontSpec.cs index 8c7b94a9c..535909b54 100644 --- a/Dalamud/Interface/FontIdentifier/IFontSpec.cs +++ b/Dalamud/Interface/FontIdentifier/IFontSpec.cs @@ -25,8 +25,26 @@ public interface IFontSpec float LineHeightPx { get; } /// - /// Gets the font no. + /// Gets or sets the font face index within a TrueType Collection (TTC) file. /// + /// + /// This property only applies to and + /// , which are TTC fonts bundling + /// multiple language-specific CJK glyph sets (Japanese, Traditional Chinese, + /// Simplified Chinese, Korean) into a single file. + /// + /// The index corresponds to the font face order in the TTC: + /// + /// 0 = Japanese + /// 1 = Traditional Chinese + /// 2 = Simplified Chinese + /// 3 = Korean + /// + /// + /// This value is ignored for all other entries. + /// Only one glyph set can be active at a time. In most cases, you can omit this— + /// Dalamud automatically selects the appropriate face based on the UI language. + /// int FontNo { get; } /// diff --git a/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs b/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs index 96b566dfe..986fa4db2 100644 --- a/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs +++ b/Dalamud/Interface/FontIdentifier/SingleFontSpec.cs @@ -65,9 +65,7 @@ public record SingleFontSpec : IFontSpec [JsonProperty] public ushort[]? GlyphRanges { get; init; } - /// - /// Gets the font no. - /// + /// [JsonProperty] public int FontNo { get; init; } diff --git a/Dalamud/Interface/ManagedFontAtlas/SafeFontConfig.cs b/Dalamud/Interface/ManagedFontAtlas/SafeFontConfig.cs index 484c3540b..61646af3f 100644 --- a/Dalamud/Interface/ManagedFontAtlas/SafeFontConfig.cs +++ b/Dalamud/Interface/ManagedFontAtlas/SafeFontConfig.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using System.Runtime.CompilerServices; using System.Text; @@ -48,8 +48,26 @@ public struct SafeFontConfig } /// - /// Gets or sets the index of font within a TTF/OTF file. + /// Gets or sets the font face index within a TrueType Collection (TTC) file. /// + /// + /// This property only applies to and + /// , which are TTC fonts bundling + /// multiple language-specific CJK glyph sets (Japanese, Traditional Chinese, + /// Simplified Chinese, Korean) into a single file. + /// + /// The index corresponds to the font face order in the TTC: + /// + /// 0 = Japanese + /// 1 = Traditional Chinese + /// 2 = Simplified Chinese + /// 3 = Korean + /// + /// + /// This value is ignored for all other entries. + /// Only one glyph set can be active at a time. In most cases, you can omit this— + /// Dalamud automatically selects the appropriate face based on the UI language. + /// public int FontNo { get => this.Raw.FontNo;