com.unity.textmeshpro@2.1.3

## [2.1.3] - 2020-10-27

Author: Unity Technologies

CHANGELOG.md

@@ -1,6 +1,37 @@
 # 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
 
+## [2.1.3] - 2020-10-27
+## [1.5.3]
+## [3.0.3]
+### Changes
+- Fixed potential null reference exception in the Input Field that can occur as a result of using a workflow that involves enabling and disabling Canvases. See [forum post](https://forum.unity.com/threads/tmp_inputfield-generatecaret-m_textcomponent-canvas-exception.940659/) for details.
+- Fixed potential Invalid AssetDatabase path warning that can be issued when assets are imported from outside the project. See [forum post](https://forum.unity.com/threads/textmesh-pro-invalid-assetdatabase-path-use-path-relative-to-the-project-folder.955731/) for details.
+- Fixed <TextMeshProUGUI> objects not being created correctly in Prefab isolation mode when using the Create context menu. See [forum post](https://forum.unity.com/threads/tmp-doesnt-like-prefabs.954186/) for details. Case #1266096
+- Fixed an issue where nesting <uppercase> and <lowercase> tags didn't behaves as expected. See [forum post](https://forum.unity.com/threads/nested-tags-of-same-kind-dont-act-as-expected.956364/) for details.
+- Fixed Input Field incorrect handling of validation with text selection. Case #1267777
+- Fixed potential null reference exception that could occur in the Input Field when hiding the soft keyboard on iOS or Android. Case #1273631
+- Fixed OnScroll event not getting passed to potential parent ScrollRect when the Input Field is in Single Line mode. Case #1270241
+- Fixed Prefab override context menu to override or revert changes not being available for some text object properties. Case #1271420
+- The sampling point size in the Font Asset Creator will now be limited to a maximum of 16,384 points for SDF over-sampled modes. This means a maximum point size of 2048 for SDF8, 1024 for SDF16 and 512 for SDF32. Case #1253370
+- Fixed Margin widget in the scene view not working correctly when the text object is rotated on the z-axis. Case #1263001
+- Fixed Input Field Scrollbar not behaving correctly when set to Bottom to Top direction. Case #1179982
+- Fixed minor UI cosmetic issue in the StyleSheet inspector. Case #1258771
+- Fixed minor UI cosmetic issue in Material inspector texture properties. Case #1163983
+- Fixed potential IndexOutOfRangeException that could occur when duplicating text objects that have more than 8 sub text objects.
+- Revised and improved Input Field with Scrollbar behavior with respect to text alignment. Case #1272647
+- Improved Input Field Name validation including adding the ability to use Hyphens. Case #1277951
+- Fixed state of MeshRenderer potentially not being mirrored on sub text objects. Case #1278329
+- Fixed GetPreferredValues() function returning incorrect values when called consecutively. See [forum post](https://forum.unity.com/threads/preferred-width-height-sometimes-0.980022/) for details.
+- Initial pass at revising some of the data structures used in the text parsing and layout process to reduce text object memory overhead.
+- Fixed incorrect positioning of IME window when using a canvas in World Space when no camera is assigned to the canvas. Case #1043535
+- Added new option to Font Asset Generation Settings to automatically clear dynamic data and atlas texture when creating a build.
+- Fixed text object properties not being applied correctly when instantiating a text prefab prior to importing TMP Essential Resources. Case #1271192
+- Fixed default text object properties potentially not being set correctly when instantiating a prefab. Case #1286412
+- Fixed incorrect parsing and display of UTF32 characters. See [forum post](https://forum.unity.com/threads/several-unicode-characters-cannot-be-shown-using-tmp.970857/#post-6316422) for details.
+- Fixed potential material error when updating a font asset generation settings when the font asset is using a non SDF shader. Case #1286132
+- Fixed minor UI cosmetic issue in the Sprite Asset Sprite Glyph Table inspector. Case #1285022
+
 ## [2.1.1] - 2020-07-26
 ## [1.5.1]
 ## [3.0.1]

Scripts/Editor/TMP_BaseEditorPanel.cs

@@ -265,7 +265,7 @@ protected virtual void OnEnable()
             m_MaterialPresetNames = GetMaterialPresets();
 
             // Get Styles from Style Sheet
-            if (!m_TextComponent.m_isWaitingOnResourceLoad)
+            if (TMP_Settings.instance != null)
                 m_StyleNames = GetStyleNames();
 
             // Register to receive events when style sheets are modified.
@@ -333,6 +333,8 @@ public void OnSceneGUI()
 
             Handles.DrawSolidRectangleWithOutline(m_HandlePoints, new Color32(255, 255, 255, 0), new Color32(255, 255, 0, 255));
 
+            Matrix4x4 matrix = m_RectTransform.worldToLocalMatrix;
+
             // Draw & process FreeMoveHandles
 
             // LEFT HANDLE
@@ -341,6 +343,9 @@ public void OnSceneGUI()
             bool hasChanged = false;
             if (oldLeft != newLeft)
             {
+                oldLeft = matrix.MultiplyPoint(oldLeft);
+                newLeft = matrix.MultiplyPoint(newLeft);
+
                 float delta = oldLeft.x - newLeft.x;
                 marginOffset.x += -delta / lossyScale.x;
                 //Debug.Log("Left Margin H0:" + handlePoints[0] + "  H1:" + handlePoints[1]);
@@ -352,6 +357,9 @@ public void OnSceneGUI()
             Vector3 newTop = Handles.FreeMoveHandle(oldTop, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
             if (oldTop != newTop)
             {
+                oldTop = matrix.MultiplyPoint(oldTop);
+                newTop = matrix.MultiplyPoint(newTop);
+
                 float delta = oldTop.y - newTop.y;
                 marginOffset.y += delta / lossyScale.y;
                 //Debug.Log("Top Margin H1:" + handlePoints[1] + "  H2:" + handlePoints[2]);
@@ -363,6 +371,9 @@ public void OnSceneGUI()
             Vector3 newRight = Handles.FreeMoveHandle(oldRight, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
             if (oldRight != newRight)
             {
+                oldRight = matrix.MultiplyPoint(oldRight);
+                newRight = matrix.MultiplyPoint(newRight);
+
                 float delta = oldRight.x - newRight.x;
                 marginOffset.z += delta / lossyScale.x;
                 hasChanged = true;
@@ -374,6 +385,9 @@ public void OnSceneGUI()
             Vector3 newBottom = Handles.FreeMoveHandle(oldBottom, Quaternion.identity, HandleUtility.GetHandleSize(m_RectTransform.position) * 0.05f, Vector3.zero, Handles.DotHandleCap);
             if (oldBottom != newBottom)
             {
+                oldBottom = matrix.MultiplyPoint(oldBottom);
+                newBottom = matrix.MultiplyPoint(newBottom);
+
                 float delta = oldBottom.y - newBottom.y;
                 marginOffset.w += -delta / lossyScale.y;
                 hasChanged = true;
@@ -415,7 +429,8 @@ protected void DrawTextInput()
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(m_TextProp, GUIContent.none);
 
-                if (EditorGUI.EndChangeCheck())
+                // Need to also compare string content due to issue related to scroll bar drag handle
+                if (EditorGUI.EndChangeCheck() && m_TextProp.stringValue != m_TextComponent.text)
                 {
                     m_TextComponent.m_inputSource = TMP_Text.TextInputSources.Text;
                     m_TextComponent.m_isInputParsingRequired = true;
@@ -455,6 +470,8 @@ protected void DrawTextInput()
                 {
                     rect = EditorGUILayout.GetControlRect(false, 17);
 
+                    EditorGUI.BeginProperty(rect, k_StyleLabel, m_TextStyleHashCodeProp);
+
                     m_TextStyleIndexLookup.TryGetValue(m_TextStyleHashCodeProp.intValue, out m_StyleSelectionIndex);
 
                     EditorGUI.BeginChangeCheck();
@@ -465,6 +482,8 @@ protected void DrawTextInput()
                         m_TextComponent.m_TextStyle = m_Styles[m_StyleSelectionIndex];
                         m_HavePropertiesChanged = true;
                     }
+
+                    EditorGUI.EndProperty();
                 }
             }
         }
@@ -518,6 +537,8 @@ void DrawFont()
                 EditorGUI.BeginChangeCheck();
                 rect = EditorGUILayout.GetControlRect(false, 17);
 
+                EditorGUI.BeginProperty(rect, k_MaterialPresetLabel, m_FontSharedMaterialProp);
+
                 float oldHeight = EditorStyles.popup.fixedHeight;
                 EditorStyles.popup.fixedHeight = rect.height;
 
@@ -528,6 +549,9 @@ void DrawFont()
                     m_MaterialPresetIndexLookup.TryGetValue(m_FontSharedMaterialProp.objectReferenceValue.GetInstanceID(), out m_MaterialPresetSelectionIndex);
 
                 m_MaterialPresetSelectionIndex = EditorGUI.Popup(rect, k_MaterialPresetLabel, m_MaterialPresetSelectionIndex, m_MaterialPresetNames);
+
+                EditorGUI.EndProperty();
+
                 if (EditorGUI.EndChangeCheck())
                 {
                     m_FontSharedMaterialProp.objectReferenceValue = m_MaterialPresets[m_MaterialPresetSelectionIndex];
@@ -547,6 +571,8 @@ void DrawFont()
             {
                 rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight + 2f);
 
+                EditorGUI.BeginProperty(rect, k_FontStyleLabel, m_FontStyleProp);
+
                 EditorGUI.PrefixLabel(rect, k_FontStyleLabel);
 
                 int styleValue = m_FontStyleProp.intValue;
@@ -594,11 +620,15 @@ void DrawFont()
                     v5 = selected == 16 ? 16 : 0;
                     v6 = selected == 32 ? 32 : 0;
                 }
+
+                EditorGUI.EndProperty();
             }
             else
             {
                 rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight + 2f);
 
+                EditorGUI.BeginProperty(rect, k_FontStyleLabel, m_FontStyleProp);
+
                 EditorGUI.PrefixLabel(rect, k_FontStyleLabel);
 
                 int styleValue = m_FontStyleProp.intValue;
@@ -651,6 +681,8 @@ void DrawFont()
                     v5 = selected == 16 ? 16 : 0;
                     v6 = selected == 32 ? 32 : 0;
                 }
+
+                EditorGUI.EndProperty();
             }
 
             if (EditorGUI.EndChangeCheck())
@@ -757,10 +789,9 @@ void DrawColor()
         {
             // FACE VERTEX COLOR
             EditorGUI.BeginChangeCheck();
-            Color vertexColor = EditorGUILayout.ColorField(k_BaseColorLabel, m_FontColorProp.colorValue, false, true, false);
+            EditorGUILayout.PropertyField(m_FontColorProp, k_BaseColorLabel);
             if (EditorGUI.EndChangeCheck())
             {
-                m_FontColorProp.colorValue = vertexColor;
                 m_HavePropertiesChanged = true;
             }
 
@@ -810,7 +841,7 @@ void DrawColor()
 
                 EditorGUILayout.PropertyField(colorMode, k_ColorModeLabel);
 
-                var rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
+                Rect rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * (EditorGUIUtility.wideMode ? 1 : 2));
 
                 EditorGUI.PrefixLabel(rect, k_CorenerColorsLabel);
 
@@ -936,6 +967,8 @@ void DrawAlignment()
             EditorGUI.BeginChangeCheck();
 
             Rect rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.currentViewWidth > 504 ? 20 : 40 + 3);
+            EditorGUI.BeginProperty(rect, k_AlignmentLabel, m_HorizontalAlignmentProp);
+            EditorGUI.BeginProperty(rect, k_AlignmentLabel, m_VerticalAlignmentProp);
 
             EditorGUI.PrefixLabel(rect, k_AlignmentLabel);
             rect.x += EditorGUIUtility.labelWidth;
@@ -950,21 +983,29 @@ void DrawAlignment()
             if (EditorGUI.EndChangeCheck())
                 m_HavePropertiesChanged = true;
 
+            EditorGUI.EndProperty();
+            EditorGUI.EndProperty();
+
             EditorGUILayout.Space();
         }
 
         void DrawWrappingOverflow()
         {
             // TEXT WRAPPING
+            Rect rect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight);
+            EditorGUI.BeginProperty(rect, k_WrappingLabel, m_EnableWordWrappingProp);
+
             EditorGUI.BeginChangeCheck();
-            int wrapSelection = EditorGUILayout.Popup(k_WrappingLabel, m_EnableWordWrappingProp.boolValue ? 1 : 0, k_WrappingOptions);
+            int wrapSelection = EditorGUI.Popup(rect, k_WrappingLabel, m_EnableWordWrappingProp.boolValue ? 1 : 0, k_WrappingOptions);
             if (EditorGUI.EndChangeCheck())
             {
                 m_EnableWordWrappingProp.boolValue = wrapSelection == 1;
                 m_HavePropertiesChanged = true;
                 m_TextComponent.m_isInputParsingRequired = true;
             }
 
+            EditorGUI.EndProperty();
+
             // TEXT OVERFLOW
             EditorGUI.BeginChangeCheck();
 

Scripts/Editor/TMP_BaseShaderGUI.cs

@@ -284,12 +284,17 @@ protected void DoTexture2D(string name, string label, bool withTilingOffset = fa
 
         void DoTexture(string name, string label, System.Type type, bool withTilingOffset = false, string[] speedNames = null)
         {
+            float objFieldSize = 60f;
+            bool smallLayout = EditorGUIUtility.currentViewWidth <= 440f && (withTilingOffset || speedNames != null);
+            float controlHeight = smallLayout ? objFieldSize * 2 : objFieldSize;
+
             MaterialProperty property = FindProperty(name, m_Properties);
             m_Editor.BeginAnimatedCheck(Rect.zero, property);
 
-            Rect rect = EditorGUILayout.GetControlRect(true, 60f);
+            Rect rect = EditorGUILayout.GetControlRect(true, controlHeight);
             float totalWidth = rect.width;
-            rect.width = EditorGUIUtility.labelWidth + 60f;
+            rect.width = EditorGUIUtility.labelWidth + objFieldSize;
+            rect.height = objFieldSize;
             s_TempLabel.text = label;
 
             EditorGUI.BeginChangeCheck();
@@ -299,8 +304,12 @@ void DoTexture(string name, string label, System.Type type, bool withTilingOffse
                 property.textureValue = tex as Texture;
             }
 
-            rect.x += rect.width + 4f;
-            rect.width = totalWidth - rect.width - 4f;
+            float additionalHeight = controlHeight - objFieldSize;
+            float xOffset = smallLayout ? rect.width - objFieldSize : rect.width;
+
+            rect.y += additionalHeight;
+            rect.x += xOffset;
+            rect.width = totalWidth - xOffset;
             rect.height = EditorGUIUtility.singleLineHeight;
 
             if (withTilingOffset)
@@ -322,7 +331,7 @@ void DoTilingOffset(Rect rect, MaterialProperty property)
             float labelWidth = EditorGUIUtility.labelWidth;
             int indentLevel = EditorGUI.indentLevel;
             EditorGUI.indentLevel = 0;
-            EditorGUIUtility.labelWidth = Mathf.Min(40f, rect.width * 0.20f);
+            EditorGUIUtility.labelWidth = Mathf.Min(37f, rect.width * 0.40f);
 
             Vector4 vector = property.textureScaleAndOffset;
 
@@ -372,15 +381,15 @@ protected void DoUVSpeed(Rect rect, string[] names)
             float labelWidth = EditorGUIUtility.labelWidth;
             int indentLevel = EditorGUI.indentLevel;
             EditorGUI.indentLevel = 0;
-            EditorGUIUtility.labelWidth = Mathf.Min(40f, rect.width * 0.20f);
+            EditorGUIUtility.labelWidth = Mathf.Min(37f, rect.width * 0.40f);
 
             s_TempLabel.text = "Speed";
             rect = EditorGUI.PrefixLabel(rect, s_TempLabel);
 
-            EditorGUIUtility.labelWidth = 13f;
-            rect.width = rect.width * 0.5f - 1f;
+            EditorGUIUtility.labelWidth = 10f;
+            rect.width = rect.width * 0.5f - 2f;
             DoFloat(rect, names[0], "X");
-            rect.x += rect.width + 2f;
+            rect.x += rect.width + 4f;
             DoFloat(rect, names[1], "Y");
             EditorGUIUtility.labelWidth = labelWidth;
             EditorGUI.indentLevel = indentLevel;