fix font definition not being set for uitoolkit elements

Author: KurtGokhan

Runtime/Frameworks/UIToolkit/Components/UIToolkitComponent.cs

@@ -158,7 +158,8 @@ protected override void ApplyStylesSelf()
                 var bg = computed.backgroundImage?.Get(0);
 
                 TargetElement.style.backgroundImage = null;
-                bg?.ResolveImage(Context, TargetElement.layout.size, tx => {
+                bg?.ResolveImage(Context, TargetElement.layout.size, tx =>
+                {
                     if (bg != ComputedStyle.backgroundImage?.Get(0)) return;
                     TargetElement.style.backgroundImage = tx?.Texture;
                 });
@@ -185,15 +186,27 @@ protected override void ApplyStylesSelf()
 
             if (computed.HasValue(StyleProperties.fontFamily))
             {
-                if (computed.fontFamily != null) computed.fontFamily?.Get(Context, x => {
-                    if (x?.Font != null) TargetElement.style.unityFont = x?.Font;
+                if (computed.fontFamily != null) computed.fontFamily?.Get(Context, x =>
+                {
+                    if (x?.Font != null)
+                    {
+                        TargetElement.style.unityFont = x.Font;
 #if REACT_TEXTCORE
-                    else if (x?.TextCoreFontAsset != null) TargetElement.style.unityFontDefinition = FontDefinition.FromSDFFont(x?.TextCoreFontAsset);
+                        TargetElement.style.unityFontDefinition = FontDefinition.FromFont(x.Font);
 #endif
+                    }
 #if REACT_TMP
-                    else if (x?.TmpFontAsset != null) TargetElement.style.unityFont = x?.TmpFontAsset?.sourceFontFile;
+                    else if (x?.TmpFontAsset != null) {
+                        TargetElement.style.unityFont = x?.TmpFontAsset?.sourceFontFile;
+#if REACT_TEXTCORE
+                        TargetElement.style.unityFontDefinition = FontDefinition.FromFont(x?.TmpFontAsset?.sourceFontFile);
+#endif
+                    }
 #endif
                     else TargetElement.style.unityFont = ResourcesHelper.DefaultFont;
+#if REACT_TEXTCORE
+                    if (x?.TextCoreFontAsset != null) TargetElement.style.unityFontDefinition = FontDefinition.FromSDFFont(x?.TextCoreFontAsset);
+#endif
                 });
             }
             else TargetElement.style.unityFont = StyleKeyword.Null;

Runtime/Types/FontReference.cs

@@ -113,7 +113,7 @@ protected override void Get(ReactContext context, AssetReferenceType realType, o
 
                 if (res.Valid) callback(res);
                 else callback(null);
-            };
+            }
         }
 
 
@@ -139,7 +139,8 @@ protected override bool ConvertInternal(object value, out IComputedValue result)
             protected override bool ParseFallback(string value, out IComputedValue result)
             {
                 return ComputedMapper.Create(out result, value, AllConverters.StringConverter,
-                    (resolvedValue) => {
+                    (resolvedValue) =>
+                    {
                         if (resolvedValue is string u) return new FontReference(AssetReferenceType.Procedural, u);
                         return null;
                     });