Merge pull request #267 from Unity-Technologies/zgh/fix_color_and_editable_text_bugs

Zgh/fix color and editable text bugs

Author: zhuxingwei

com.unity.uiwidgets/Runtime/foundation/diagnostics.cs

@@ -627,8 +627,8 @@ public static bool _isSingleLine(DiagnosticsTreeStyle? style) {
             return style == DiagnosticsTreeStyle.singleLine;
         }
 
-        public static bool FloatEqual(float left, float right) {
-            return Mathf.Abs(left - right) < precisionErrorTolerance;
+        public static bool FloatEqual(float left, float right, float precisionTolerance = precisionErrorTolerance) {
+            return Mathf.Abs(left - right) < precisionTolerance;
         }
     }
 

com.unity.uiwidgets/Runtime/painting/colors.cs

@@ -12,13 +12,13 @@ internal static float _getHue(float red, float green, float blue, float max, flo
             if (max == 0.0f || delta == 0.0f) {
                 hue = 0.0f;
             }
-            else if (max == red) {
+            else if (foundation_.FloatEqual(max,red)) {
                 hue = 60.0f * (((green - blue) / delta) % 6);
             }
-            else if (max == green) {
+            else if (foundation_.FloatEqual(max,green)) {
                 hue = 60.0f * (((blue - red) / delta) + 2);
             }
-            else if (max == blue) {
+            else if (foundation_.FloatEqual(max,blue)) {
                 hue = 60.0f * (((red - green) / delta) + 4);
             }
 
@@ -92,14 +92,14 @@ public static HSVColor fromAHSV(float alpha, float hue, float saturation, float
         }
 
         public static HSVColor fromColor(Color color) {
-            float red = color.red / 0xFF;
-            float green = color.green / 0xFF;
-            float blue = color.blue / 0xFF;
+            float red = (float)color.red / 0xFF;
+            float green = (float)color.green / 0xFF;
+            float blue = (float)color.blue / 0xFF;
 
             float max = Mathf.Max(red, Mathf.Max(green, blue));
             float min = Mathf.Min(red, Mathf.Min(green, blue));
             float delta = max - min;
-            float alpha = color.alpha / 0xFF;
+            float alpha = (float)color.alpha / 0xFF;
             float hue = painting_._getHue(red, green, blue, max, delta);
             float saturation = max == 0.0f ? 0.0f : delta / max;
 
@@ -164,18 +164,18 @@ public static HSLColor fromAHSL(float alpha, float hue, float saturation, float
         }
 
         public static HSLColor fromColor(Color color) {
-            float red = color.red / 0xFF;
-            float green = color.green / 0xFF;
-            float blue = color.blue / 0xFF;
+            float red = (float)color.red / 0xFF;
+            float green = (float)color.green / 0xFF;
+            float blue = (float)color.blue / 0xFF;
 
             float max = Mathf.Max(red, Mathf.Max(green, blue));
             float min = Mathf.Min(red, Mathf.Min(green, blue));
             float delta = max - min;
 
-            float alpha = color.alpha / 0xFF;
+            float alpha = (float)color.alpha / 0xFF;
             float hue = painting_._getHue(red, green, blue, max, delta);
             float lightness = (max + min) / 2.0f;
-            float saturation = lightness == 1.0f
+            float saturation = foundation_.FloatEqual(lightness, 1.0f)
                 ? 0.0f
                 : ((delta / (1.0f - Mathf.Abs(2.0f * lightness - 1.0f))).clamp(0.0f, 1.0f));
             return HSLColor.fromAHSL(alpha, hue, saturation, lightness);

com.unity.uiwidgets/Runtime/widgets/editable_text.cs

@@ -191,23 +191,13 @@ public EditableText(
                 paste: true,
                 selectAll: true
             );
-            inputFormatters = inputFormatters ?? new List<TextInputFormatter>();
             keyboardType = keyboardType ?? (maxLines == 1 ? TextInputType.text : TextInputType.multiline);
-            List<TextInputFormatter> formatters = new List<TextInputFormatter>();
-            if (inputFormatters == null) {
-                formatters = inputFormatters;
-            }
 
-            inputFormatters = maxLines == 1
-                ? new List<TextInputFormatter>() {
-                    BlacklistingTextInputFormatter.singleLineFormatter,
-                }
-                : inputFormatters;
+            this.inputFormatters = inputFormatters?? new List<TextInputFormatter>();
             if (maxLines == 1) {
-                foreach (var formatter in formatters) {
-                    inputFormatters.Add(formatter);
-                }
+                this.inputFormatters.Add(BlacklistingTextInputFormatter.singleLineFormatter);
             }
+            
             showCursor = showCursor ?? !readOnly;
 
             this.readOnly = readOnly;