Revert "[NUI] apply scaling factor to point size (#3594)"
authorEverLEEst(SangHyeon Lee) <sh10233.lee@samsung.com>
Wed, 5 Jan 2022 11:34:23 +0000 (20:34 +0900)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 19 Jan 2022 05:29:33 +0000 (14:29 +0900)
This reverts commit c37096208436058f9a198d5124dedb5f6aca2164.

src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs

index d5588fb..013c8a1 100755 (executable)
@@ -101,10 +101,6 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-                if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-                {
-                    newValue = (float)newValue * GraphicsTypeManager.Instance.ScalingFactor;
-                }
                 Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PointSize, new Tizen.NUI.PropertyValue((float)newValue));
             }
         }),
@@ -113,10 +109,6 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             float temp = 0.0f;
             Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PointSize).Get(out temp);
-            if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-            {
-                temp = (float)temp / GraphicsTypeManager.Instance.ScalingFactor;
-            }
             return temp;
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -521,10 +513,6 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-                if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-                {
-                    newValue = (float)newValue * GraphicsTypeManager.Instance.ScalingFactor;
-                }
                 Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputPointSize, new Tizen.NUI.PropertyValue((float)newValue));
             }
         }),
@@ -533,10 +521,6 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             float temp = 0.0f;
             Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputPointSize).Get(out temp);
-            if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-            {
-                temp = (float)temp / GraphicsTypeManager.Instance.ScalingFactor;
-            }
             return temp;
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index 906a587..a2f6444 100755 (executable)
@@ -169,10 +169,6 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-                if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-                {
-                    newValue = (float)newValue * GraphicsTypeManager.Instance.ScalingFactor;
-                }
                 Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PointSize, new Tizen.NUI.PropertyValue((float)newValue));
             }
         }),
@@ -181,10 +177,6 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             float temp = 0.0f;
             Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PointSize).Get(out temp);
-            if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-            {
-                temp = (float)temp / GraphicsTypeManager.Instance.ScalingFactor;
-            }
             return temp;
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -729,10 +721,6 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-                if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-                {
-                    newValue = (float)newValue * GraphicsTypeManager.Instance.ScalingFactor;
-                }
                 Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputPointSize, new Tizen.NUI.PropertyValue((float)newValue));
             }
         }),
@@ -741,10 +729,6 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             float temp = 0.0f;
             Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputPointSize).Get(out temp);
-            if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-            {
-                temp = (float)temp / GraphicsTypeManager.Instance.ScalingFactor;
-            }
             return temp;
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index 6ab2cea..35d6d71 100755 (executable)
@@ -136,10 +136,6 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             float temp = 0.0f;
             Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.PointSize).Get(out temp);
-            if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-            {
-                temp = (float)temp / GraphicsTypeManager.Instance.ScalingFactor;
-            }
             return temp;
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -885,10 +881,6 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-                if (GraphicsTypeManager.Instance.ScalingFactor != 0.0f)
-                {
-                    value = value * GraphicsTypeManager.Instance.ScalingFactor;
-                }
                 Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.PointSize, new Tizen.NUI.PropertyValue((float)value));
                 RequestLayout();
             }