Fixed bugs with Unity 2019.1

pnarimani · May 6, 2019 · ee58242 · ee58242
1 parent 4dd7439
commit ee58242
Show file tree

Hide file tree

Showing 18 changed files with 10,779 additions and 1,576 deletions.
diff --git a/Assets/RTLTMPro/Fonts/segoeui Numbers SDF.asset b/Assets/RTLTMPro/Fonts/segoeui Numbers SDF.asset
diff --git a/Assets/RTLTMPro/Fonts/segoeui RTL SDF.asset b/Assets/RTLTMPro/Fonts/segoeui RTL SDF.asset
diff --git a/Assets/RTLTMPro/Fonts/segoeui Tashkil SDF.asset b/Assets/RTLTMPro/Fonts/segoeui Tashkil SDF.asset
diff --git a/Assets/RTLTMPro/Scripts/Editor/RTLTextMeshPro3DEditor.cs b/Assets/RTLTMPro/Scripts/Editor/RTLTextMeshPro3DEditor.cs
@@ -8,15 +8,13 @@ namespace RTLTMPro
     public class RTLTextMeshPro3DEditor : TMP_UiEditorPanel
     {
         private SerializedProperty originalTextProp;
-        private SerializedProperty havePropertiesChangedProp;
         private SerializedProperty inputSourceProp;
         private SerializedProperty isInputPasingRequiredProp;
         private SerializedProperty preserveNumbersProp;
         private SerializedProperty farsiProp;
         private SerializedProperty fixTagsProp;
         private SerializedProperty forceFixProp;
 
-        private bool changed;
         private bool foldout;
         private RTLTextMeshPro3D tmpro;
 
@@ -29,7 +27,6 @@ public class RTLTextMeshPro3DEditor : TMP_UiEditorPanel
             fixTagsProp = serializedObject.FindProperty("fixTags");
             forceFixProp = serializedObject.FindProperty("forceFix");
             originalTextProp = serializedObject.FindProperty("originalText");
-            havePropertiesChangedProp = serializedObject.FindProperty("m_havePropertiesChanged");
             inputSourceProp = serializedObject.FindProperty("m_inputSource");
             isInputPasingRequiredProp = serializedObject.FindProperty("m_isInputParsingRequired");
         }
@@ -46,13 +43,6 @@ public override void OnInspectorGUI()
             ListenForZeroWidthNoJoiner();
 
             if (EditorGUI.EndChangeCheck())
-            {
-                inputSourceProp.enumValueIndex = 0;
-                isInputPasingRequiredProp.boolValue = true;
-                changed = true;
-            }
-
-            if (changed)
                 OnChanged();
 
             serializedObject.ApplyModifiedProperties();
@@ -65,23 +55,24 @@ public override void OnInspectorGUI()
                 DrawOptions();
 
                 if (GUILayout.Button("Re-Fix"))
-                    changed = true;
+                    m_HavePropertiesChanged = true;
 
                 if (EditorGUI.EndChangeCheck())
-                {
-                    changed = true;
-                }
+                    m_HavePropertiesChanged = true;
             }
 
-            if(changed)
+            if (m_HavePropertiesChanged)
                 OnChanged();
+
+            serializedObject.ApplyModifiedProperties();
         }
 
         protected void OnChanged()
         {
             tmpro.UpdateText();
-            havePropertiesChangedProp.boolValue = true;
-            changed = false;
+            m_HavePropertiesChanged = false;
+            m_TextComponent.havePropertiesChanged = true;
+            m_TextComponent.ComputeMarginSize();
             EditorUtility.SetDirty(target);
         }
 

diff --git a/Assets/RTLTMPro/Scripts/Editor/RTLTextMeshProEditor.cs b/Assets/RTLTMPro/Scripts/Editor/RTLTextMeshProEditor.cs
@@ -8,15 +8,13 @@ namespace RTLTMPro
     public class RTLTextMeshProEditor : TMP_UiEditorPanel
     {
         private SerializedProperty originalTextProp;
-        private SerializedProperty havePropertiesChangedProp;
         private SerializedProperty inputSourceProp;
         private SerializedProperty isInputPasingRequiredProp;
         private SerializedProperty preserveNumbersProp;
         private SerializedProperty farsiProp;
         private SerializedProperty fixTagsProp;
         private SerializedProperty forceFixProp;
 
-        private bool changed;
         private bool foldout;
         private RTLTextMeshPro tmpro;
 
@@ -29,7 +27,6 @@ public class RTLTextMeshProEditor : TMP_UiEditorPanel
             fixTagsProp = serializedObject.FindProperty("fixTags");
             forceFixProp = serializedObject.FindProperty("forceFix");
             originalTextProp = serializedObject.FindProperty("originalText");
-            havePropertiesChangedProp = serializedObject.FindProperty("m_havePropertiesChanged");
             inputSourceProp = serializedObject.FindProperty("m_inputSource");
             isInputPasingRequiredProp = serializedObject.FindProperty("m_isInputParsingRequired");
         }
@@ -46,13 +43,6 @@ public override void OnInspectorGUI()
             ListenForZeroWidthNoJoiner();
 
             if (EditorGUI.EndChangeCheck())
-            {
-                inputSourceProp.enumValueIndex = 0;
-                isInputPasingRequiredProp.boolValue = true;
-                changed = true;
-            }
-
-            if (changed)
                 OnChanged();
 
             serializedObject.ApplyModifiedProperties();
@@ -65,15 +55,13 @@ public override void OnInspectorGUI()
                 DrawOptions();
 
                 if (GUILayout.Button("Re-Fix"))
-                    changed = true;
+                    m_HavePropertiesChanged = true;
 
                 if (EditorGUI.EndChangeCheck())
-                {
-                    changed = true;
-                }
+                    m_HavePropertiesChanged = true;
             }
 
-            if(changed)
+            if (m_HavePropertiesChanged)
                 OnChanged();
 
             serializedObject.ApplyModifiedProperties();
@@ -82,8 +70,9 @@ public override void OnInspectorGUI()
         protected void OnChanged()
         {
             tmpro.UpdateText();
-            havePropertiesChangedProp.boolValue = true;
-            changed = false;
+            m_HavePropertiesChanged = false;
+            m_TextComponent.havePropertiesChanged = true;
+            m_TextComponent.ComputeMarginSize();
             EditorUtility.SetDirty(target);
         }
 

diff --git a/Assets/RTLTMPro/Tests/RTLSupportTests.cs b/Assets/RTLTMPro/Tests/RTLSupportTests.cs
@@ -0,0 +1,93 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Security.Policy;
+using NUnit.Framework;
+using RTLTMPro;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Tests
+{
+    public class RTLSupportTests
+    {
+        [Test]
+        public void ArabicTextIsSuccessfulyConverted()
+        {
+            const string input = "هَذَا النَّص العربي";
+            const string expected = "ﻲﺑﺮﻌﻟا ﺺﱠﻨﻟا اَﺬَﻫ";
+
+            var support = new RTLSupport
+            {
+                Farsi = false, PreserveNumbers = true, FixTextTags = false
+            };
+
+            string result = support.FixRTL(input);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void FarsiTextIsSuccessfulyConverted()
+        {
+            const string input = "متن فارسی";
+            const string expected = "ﯽﺳرﺎﻓ ﻦﺘﻣ";
+
+            var support = new RTLSupport
+            {
+                Farsi = true, PreserveNumbers = true, FixTextTags = false
+            };
+
+            string result = support.FixRTL(input);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void TashkeelIsMaintainedInBeginingOfText()
+        {
+            const string input = "ِصبا";
+            const string expected = "ِﺎﺒﺻ";
+
+            var support = new RTLSupport
+            {
+                Farsi = true, PreserveNumbers = true, FixTextTags = false
+            };
+
+            string result = support.FixRTL(input);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void TashkeelIsMaintainedInMiddleOfText()
+        {
+            const string input = "مَرد";
+            const string expected = "دﺮَﻣ";
+
+            var support = new RTLSupport
+            {
+                Farsi = true, PreserveNumbers = true, FixTextTags = false
+            };
+
+            string result = support.FixRTL(input);
+
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void TashkeelIsMaintainedInEndOfText()
+        {
+            const string input = "صبحِ";
+            const string expected = "ِﺢﺒﺻ";
+
+            var support = new RTLSupport
+            {
+                Farsi = true, PreserveNumbers = true, FixTextTags = false
+            };
+
+            string result = support.FixRTL(input);
+
+            Assert.AreEqual(expected, result);
+        }
+    }
+}
diff --git a/Assets/RTLTMPro/Tests/RTLSupportTests.cs.meta b/Assets/RTLTMPro/Tests/RTLSupportTests.cs.meta
diff --git a/Assets/RTLTMPro/Tests/RTLTMPro-Tests.asmdef b/Assets/RTLTMPro/Tests/RTLTMPro-Tests.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "RTLTMPro-Tests",
+    "references": [
+        "RTLTMPro"
+    ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}
diff --git a/Assets/RTLTMPro/Tests/RTLTMPro-Tests.asmdef.meta b/Assets/RTLTMPro/Tests/RTLTMPro-Tests.asmdef.meta
diff --git a/Assets/TextMesh Pro/Glyph Report.txt b/Assets/TextMesh Pro/Glyph Report.txt
@@ -0,0 +1,7 @@
+Font: IRANSansDN  Pt. Size: 98
+Characters packed: 163/165
+
+Missing Characters
+----------------------------------------
+ID: 64396	Hex: FB8C	Char [ﮌ]
+ID: 64397	Hex: FB8D	Char [ﮍ]
diff --git a/Assets/TextMesh Pro/Glyph Report.txt.meta b/Assets/TextMesh Pro/Glyph Report.txt.meta