com.unity.textmeshpro@3.0.0

## [3.0.0] - 2020-06-30

Author: Unity Technologies

CHANGELOG.md

@@ -1,6 +1,23 @@
 # Changelog
 These are the release notes for the TextMesh Pro UPM package which was first introduced with Unity 2018.1. Please see the following link for the Release Notes for prior versions of TextMesh Pro. http://digitalnativestudios.com/forum/index.php?topic=1363.0
 
+## [3.0.0] - 2020-06-30
+## [2.1.0]
+## [1.5.0]
+### Changes
+- Added support to control if a text object is Maskable and affected by UI Mask components. The new setting is found in the Extra Settings section of the <TextMeshProUGUI> component inspector.
+- Fixed potential Null Reference Exception when trying to add characters and / or glyphs to a font asset via scripting and before it has been initialized or ReadFontAssetDefinition() has been called.
+- Fixed incorrect preferred width values when using alternative font weight font assets. Case #1255336
+- Enabling or disabling the Mesh Renderer of a <TextMeshPro> text object should now also mirror that state on any sub text object renderers as well.
+- Fixed <sprite> incorrect position when this sprite is the only character in the text and when the sprite asset face info has not been defined.
+- Fixed potential Null Reference Exception related to culling when entering play mode.
+- Added OnPreRenderText event delegate to allow potential modification of the text geometry before it is uploaded to the mesh and rendered.
+- Fixed missing warning when the requested character is missing from the font asset or any potential fallbacks. Case #1256879
+- Fixed potential issue with Underline and StrikeThrough when using alternative typeface. Case #1255336
+- Fixed potential errors in the Text StyleSheet Inspector when adding or removing Text Styles after resetting the asset. Case #1254602 
+- Fixed text Margin property values not being draggable in the Extra Settings section of the text inspector. Case #1253447
+- It will no longer be possible to create Editor Presets for the TMP_FontAsset, TMP_SpriteAsset, TMP_StyleSheet, TMP_ColorGradient and TMP_Settings as these are persistent and runtime assets. Case #1251229
+
 ## [3.0.0-preview.14] - 2020-06-08
 ## [2.1.0-preview.14]
 ## [1.5.0-preview.14]

Scripts/Editor/TMP_BaseEditorPanel.cs

@@ -1282,44 +1282,41 @@ protected void DrawMarginProperty(SerializedProperty property, GUIContent label)
 
             float width = rect.width + 3;
             pos0.width = EditorGUIUtility.labelWidth;
-            GUI.Label(pos0, label);
+            EditorGUI.PrefixLabel(pos0, label);
 
-            var vec = property.vector4Value;
+            Vector4 margins = property.vector4Value;
 
             float widthB = width - EditorGUIUtility.labelWidth;
             float fieldWidth = widthB / 4;
             pos0.width = Mathf.Max(fieldWidth - 5, 45f);
 
             // Labels
             pos0.x = EditorGUIUtility.labelWidth + 15;
-            GUI.Label(pos0, k_LeftLabel);
+            margins.x = DrawMarginField(pos0, "Left", margins.x);
 
             pos0.x += fieldWidth;
-            GUI.Label(pos0, k_TopLabel);
+            margins.y = DrawMarginField(pos0, "Top", margins.y);
 
             pos0.x += fieldWidth;
-            GUI.Label(pos0, k_RightLabel);
+            margins.z = DrawMarginField(pos0, "Right", margins.z);
 
             pos0.x += fieldWidth;
-            GUI.Label(pos0, k_BottomLabel);
+            margins.w = DrawMarginField(pos0, "Bottom", margins.w);
 
-            pos0.y += 18;
+            property.vector4Value = margins;
 
-            pos0.x = EditorGUIUtility.labelWidth + 15;
-            vec.x = EditorGUI.FloatField(pos0, GUIContent.none, vec.x);
-
-            pos0.x += fieldWidth;
-            vec.y = EditorGUI.FloatField(pos0, GUIContent.none, vec.y);
-
-            pos0.x += fieldWidth;
-            vec.z = EditorGUI.FloatField(pos0, GUIContent.none, vec.z);
+            EditorGUI.EndProperty();
+        }
 
-            pos0.x += fieldWidth;
-            vec.w = EditorGUI.FloatField(pos0, GUIContent.none, vec.w);
+        float DrawMarginField(Rect position, string label, float value)
+        {
+            int controlId = GUIUtility.GetControlID(FocusType.Keyboard, position);
+            EditorGUI.PrefixLabel(position, controlId, new GUIContent(label));
 
-            property.vector4Value = vec;
+            Rect dragZone = new Rect(position.x, position.y, position.width, position.height);
+            position.y += EditorGUIUtility.singleLineHeight;
 
-            EditorGUI.EndProperty();
+            return EditorGUI.DoFloatField(EditorGUI.s_RecycledEditor, position, dragZone, controlId, value, EditorGUI.kFloatFieldFormatString, EditorStyles.numberField, true);
         }
 
         protected void DrawPropertySlider(GUIContent label, SerializedProperty property)

Scripts/Editor/TMP_EditorPanelUI.cs

@@ -9,13 +9,16 @@ namespace TMPro.EditorUtilities
     public class TMP_EditorPanelUI : TMP_BaseEditorPanel
     {
         static readonly GUIContent k_RaycastTargetLabel = new GUIContent("Raycast Target", "Whether the text blocks raycasts from the Graphic Raycaster.");
+        static readonly GUIContent k_MaskableLabel = new GUIContent("Maskable", "Determines if the text object will be affected by UI Mask.");
 
         SerializedProperty m_RaycastTargetProp;
+        private SerializedProperty m_MaskableProp;
 
         protected override void OnEnable()
         {
             base.OnEnable();
             m_RaycastTargetProp = serializedObject.FindProperty("m_RaycastTarget");
+            m_MaskableProp = serializedObject.FindProperty("m_Maskable");
         }
 
         protected override void DrawExtraSettings()
@@ -40,6 +43,8 @@ protected override void DrawExtraSettings()
 
                 DrawRaycastTarget();
 
+                DrawMaskable();
+
                 DrawParsing();
 
                 DrawSpriteAsset();
@@ -69,6 +74,23 @@ protected void DrawRaycastTarget()
             }
         }
 
+        protected void DrawMaskable()
+        {
+            EditorGUI.BeginChangeCheck();
+            EditorGUILayout.PropertyField(m_MaskableProp, k_MaskableLabel);
+            if (EditorGUI.EndChangeCheck())
+            {
+                m_TextComponent.maskable = m_MaskableProp.boolValue;
+
+                // Change needs to propagate to the child sub objects.
+                MaskableGraphic[] maskableGraphics = m_TextComponent.GetComponentsInChildren<MaskableGraphic>();
+                for (int i = 1; i < maskableGraphics.Length; i++)
+                    maskableGraphics[i].maskable = m_MaskableProp.boolValue;
+
+                m_HavePropertiesChanged = true;
+            }
+        }
+
         // Method to handle multi object selection
         protected override bool IsMixSelectionTypes()
         {
@@ -99,4 +121,4 @@ protected override void OnUndoRedo()
             }
         }
     }
-}
+}

Scripts/Editor/TMP_SpriteAssetEditor.cs

@@ -5,8 +5,6 @@
 using System.Collections.Generic;
 
 
-
-
 namespace TMPro.EditorUtilities
 {
 
@@ -618,27 +616,28 @@ public override void OnInspectorGUI()
                 #region Global Tools
                 GUI.enabled = true;
                 EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-                EditorGUILayout.LabelField("Global Offsets & Scale", EditorStyles.boldLabel);
+                rect = EditorGUILayout.GetControlRect(false, 40);
+
+                float width = (rect.width - 75f) / 4;
+                EditorGUI.LabelField(rect, "Global Offsets & Scale", EditorStyles.boldLabel);
+
 
+                rect.x += 70;
                 bool old_ChangedState = GUI.changed;
 
                 GUI.changed = false;
-                EditorGUILayout.BeginHorizontal(EditorStyles.helpBox);
-                GUILayout.Space(25f);
-
-                m_xOffset = EditorGUILayout.FloatField(new GUIContent("OX:"), m_xOffset);
+                m_xOffset = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 0, rect.y + 20, width - 5f, 18), new GUIContent("OX:"), m_xOffset);
                 if (GUI.changed) UpdateGlobalProperty("m_HorizontalBearingX", m_xOffset);
 
-                m_yOffset = EditorGUILayout.FloatField(new GUIContent("OY:"), m_yOffset);
+                m_yOffset = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 1, rect.y + 20, width - 5f, 18), new GUIContent("OY:"), m_yOffset);
                 if (GUI.changed) UpdateGlobalProperty("m_HorizontalBearingY", m_yOffset);
 
-                m_xAdvance = EditorGUILayout.FloatField(new GUIContent("ADV."), m_xAdvance);
+                m_xAdvance = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 2, rect.y + 20, width - 5f, 18), new GUIContent("ADV."), m_xAdvance);
                 if (GUI.changed) UpdateGlobalProperty("m_HorizontalAdvance", m_xAdvance);
 
-                m_scale = EditorGUILayout.FloatField(new GUIContent("SF."), m_scale);
+                m_scale = EditorGUI.FloatField(new Rect(rect.x + 5f + width * 3, rect.y + 20, width - 5f, 18), new GUIContent("SF."), m_scale);
                 if (GUI.changed) UpdateGlobalProperty("m_Scale", m_scale);
 
-                EditorGUILayout.EndHorizontal();
                 EditorGUILayout.EndVertical();
                 #endregion
 

Scripts/Editor/TMP_StyleAssetMenu.cs

@@ -33,7 +33,7 @@ public static void CreateTextMeshProObjectPerform()
             }
 
 
-            string filePathWithName = AssetDatabase.GenerateUniqueAssetPath(filePath + "/TMP StyleSheet.asset");
+            string filePathWithName = AssetDatabase.GenerateUniqueAssetPath(filePath + "/Text StyleSheet.asset");
 
             //// Create new Style Sheet Asset.
             TMP_StyleSheet styleSheet = ScriptableObject.CreateInstance<TMP_StyleSheet>();
@@ -53,4 +53,4 @@ public static void CreateTextMeshProObjectPerform()
         }
     }
 
-}
+}

Scripts/Editor/TMP_StyleSheetEditor.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEditor;
 
 
@@ -25,7 +26,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             SerializedProperty closingDefinitionArray = property.FindPropertyRelative("m_ClosingTagArray");
 
 
-            EditorGUIUtility.labelWidth = 90;
+            EditorGUIUtility.labelWidth = 86;
             position.height = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
             float labelHeight = position.height + 2f;
 
@@ -51,16 +52,16 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             rect1.x += 65;
             rect1.width = position.width / 2 - 75;
             EditorGUI.PropertyField(rect1, hashCodeProperty, GUIContent.none);
-            
+
             GUI.enabled = true;
 
             // Text Tags
             EditorGUI.BeginChangeCheck();
-            
+
             // Opening Tags
             position.y += labelHeight;
             GUI.Label(position, "Opening Tags");
-            Rect textRect1 = new Rect(108, position.y, position.width - 86, 35);
+            Rect textRect1 = new Rect(110, position.y, position.width - 86, 35);
             openingDefinitionProperty.stringValue = EditorGUI.TextArea(textRect1, openingDefinitionProperty.stringValue);
             if (EditorGUI.EndChangeCheck())
             {
@@ -82,22 +83,22 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             // Closing Tags
             position.y += 38;
             GUI.Label(position, "Closing Tags");
-            Rect textRect2 = new Rect(108, position.y, position.width - 86, 35);
+            Rect textRect2 = new Rect(110, position.y, position.width - 86, 35);
             closingDefinitionProperty.stringValue = EditorGUI.TextArea(textRect2, closingDefinitionProperty.stringValue);
 
             if (EditorGUI.EndChangeCheck())
             {
                 // If any properties have changed, we need to update the Opening and Closing Arrays.
                 int size = closingDefinitionProperty.stringValue.Length;
-                
+
                 // Adjust array size to match new string length.
                 if (closingDefinitionArray.arraySize != size) closingDefinitionArray.arraySize = size;
-                
+
                 for (int i = 0; i < size; i++)
                 {
                     SerializedProperty element = closingDefinitionArray.GetArrayElementAtIndex(i);
                     element.intValue = closingDefinitionProperty.stringValue[i];
-                }            
+                }
             }
 
         }
@@ -132,19 +133,19 @@ public override void OnInspectorGUI()
             serializedObject.Update();
 
             m_IsStyleSheetDirty = false;
-            int arraySize = m_StyleListProp.arraySize;
+            int elementCount = m_StyleListProp.arraySize;
             int itemsPerPage = (Screen.height - 100) / 110;
 
-            if (arraySize > 0)
+            if (elementCount > 0)
             {
                 // Display each Style entry using the StyleDrawer PropertyDrawer.
-                for (int i = itemsPerPage * m_Page; i < arraySize && i < itemsPerPage * (m_Page + 1); i++)
+                for (int i = itemsPerPage * m_Page; i < elementCount && i < itemsPerPage * (m_Page + 1); i++)
                 {
                     // Define the start of the selection region of the element.
                     Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
 
                     EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-   
+
                     SerializedProperty styleProperty = m_StyleListProp.GetArrayElementAtIndex(i);
                     EditorGUI.BeginChangeCheck();
                     EditorGUILayout.PropertyField(styleProperty);
@@ -153,7 +154,7 @@ public override void OnInspectorGUI()
                     {
                         //
                     }
-      
+
                     // Define the end of the selection region of the element.
                     Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
 
@@ -171,7 +172,7 @@ public override void OnInspectorGUI()
                             GUIUtility.keyboardControl = 0;
                         }
                     }
-                    
+
                     // Handle Selection Highlighting
                     if (m_SelectedElement == i)
                         TMP_EditorUtility.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
@@ -193,7 +194,7 @@ public override void OnInspectorGUI()
 
             // Move Style down.
             rect.x += rect.width;
-            if (m_SelectedElement == arraySize - 1) { GUI.enabled = false; }
+            if (m_SelectedElement == elementCount - 1) { GUI.enabled = false; }
             if (GUI.Button(rect, "Down"))
             {
                 SwapStyleElements(m_SelectedElement, m_SelectedElement + 1);
@@ -205,7 +206,10 @@ public override void OnInspectorGUI()
             if (GUI.Button(rect, "+"))
             {
                 int index = m_SelectedElement == -1 ? 0 : m_SelectedElement;
-                
+
+                if (index > elementCount)
+                    index = elementCount;
+
                 // Copy selected element
                 m_StyleListProp.InsertArrayElementAtIndex(index);
 
@@ -218,7 +222,7 @@ public override void OnInspectorGUI()
 
             // Delete style
             rect.x += rect.width;
-            if (m_SelectedElement == -1) GUI.enabled = false;
+            if (m_SelectedElement == -1 || m_SelectedElement >= elementCount) GUI.enabled = false;
             if (GUI.Button(rect, "-"))
             {
                 int index = m_SelectedElement == -1 ? 0 : m_SelectedElement;
@@ -250,19 +254,19 @@ public override void OnInspectorGUI()
             // PAGE COUNTER
             GUI.enabled = true;
             pagePos.x += pagePos.width;
-            int totalPages = (int)(arraySize / (float)itemsPerPage + 0.999f);
+            int totalPages = (int)(elementCount / (float)itemsPerPage + 0.999f);
             GUI.Label(pagePos, "Page " + (m_Page + 1) + " / " + totalPages, TMP_UIStyleManager.centeredLabel);
 
             // Next Page
             pagePos.x += pagePos.width;
-            if (itemsPerPage * (m_Page + 1) < arraySize) GUI.enabled = true;
+            if (itemsPerPage * (m_Page + 1) < elementCount) GUI.enabled = true;
             else GUI.enabled = false;
 
             if (GUI.Button(pagePos, "Next"))
                 m_Page += 1 * shiftMultiplier;
 
             // Clamp page range
-            m_Page = Mathf.Clamp(m_Page, 0, arraySize / itemsPerPage);
+            m_Page = Mathf.Clamp(m_Page, 0, elementCount / itemsPerPage);
 
 
             if (serializedObject.ApplyModifiedProperties())
@@ -276,11 +280,10 @@ public override void OnInspectorGUI()
                 }
             }
 
-            // Clear selection if mouse event was not consumed. 
+            // Clear selection if mouse event was not consumed.
             GUI.enabled = true;
             if (currentEvent.type == EventType.MouseDown && currentEvent.button == 0)
                 m_SelectedElement = -1;
-            
 
         }