|
@@ -228,12 +228,12 @@ namespace QuestPDF.Infrastructure
|
|
|
internal static TextStyle ApplyInheritedStyle(this TextStyle style, TextStyle parent)
|
|
internal static TextStyle ApplyInheritedStyle(this TextStyle style, TextStyle parent)
|
|
|
{
|
|
{
|
|
|
var cacheKey = (style, parent);
|
|
var cacheKey = (style, parent);
|
|
|
- return TextStyleApplyInheritedCache.GetOrAdd(cacheKey, key => key.origin.ApplyStyleProperties(key.parent, overrideStyle: false, overrideFontFamily: false, applyFallback: true).UpdateFontFallback(true));
|
|
|
|
|
|
|
+ return TextStyleApplyInheritedCache.GetOrAdd(cacheKey, key => key.origin.ApplyStyleProperties(key.parent, overrideStyle: false, overrideFontFamily: false, applyFallback: true).UpdateFontFallback(overrideStyle: true));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
internal static TextStyle ApplyGlobalStyle(this TextStyle style)
|
|
internal static TextStyle ApplyGlobalStyle(this TextStyle style)
|
|
|
{
|
|
{
|
|
|
- return TextStyleApplyGlobalCache.GetOrAdd(style, key => key.ApplyStyleProperties(TextStyle.LibraryDefault, overrideStyle: false, overrideFontFamily: false, applyFallback: true).UpdateFontFallback(false));
|
|
|
|
|
|
|
+ return TextStyleApplyGlobalCache.GetOrAdd(style, key => key.ApplyStyleProperties(TextStyle.LibraryDefault, overrideStyle: false, overrideFontFamily: false, applyFallback: true).UpdateFontFallback(overrideStyle: false));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private static TextStyle UpdateFontFallback(this TextStyle style, bool overrideStyle)
|
|
private static TextStyle UpdateFontFallback(this TextStyle style, bool overrideStyle)
|
|
@@ -258,7 +258,7 @@ namespace QuestPDF.Infrastructure
|
|
|
|
|
|
|
|
result = MutateStyle(result, TextStyleProperty.Color, parent.Color, overrideStyle);
|
|
result = MutateStyle(result, TextStyleProperty.Color, parent.Color, overrideStyle);
|
|
|
result = MutateStyle(result, TextStyleProperty.BackgroundColor, parent.BackgroundColor, overrideStyle);
|
|
result = MutateStyle(result, TextStyleProperty.BackgroundColor, parent.BackgroundColor, overrideStyle);
|
|
|
- result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideFontFamily);
|
|
|
|
|
|
|
+ result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideStyle);
|
|
|
result = MutateStyle(result, TextStyleProperty.Size, parent.Size, overrideStyle);
|
|
result = MutateStyle(result, TextStyleProperty.Size, parent.Size, overrideStyle);
|
|
|
result = MutateStyle(result, TextStyleProperty.LineHeight, parent.LineHeight, overrideStyle);
|
|
result = MutateStyle(result, TextStyleProperty.LineHeight, parent.LineHeight, overrideStyle);
|
|
|
result = MutateStyle(result, TextStyleProperty.LetterSpacing, parent.LetterSpacing, overrideStyle);
|
|
result = MutateStyle(result, TextStyleProperty.LetterSpacing, parent.LetterSpacing, overrideStyle);
|