From f795c91df64e4c4650f2a1250bb9823eae77336d Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Thu, 13 Jul 2023 21:56:34 +0900 Subject: [PATCH] [NUI] Update Font size scale again based on the updated guide - The font size scales are changed according to the latest GUI guide. - Five stages of Font size scale : : 87% -> 100% -> 113% -> 126% -> 140 % Signed-off-by: Seoyeon Kim --- src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs | 4 ++-- .../testcase/public/BaseComponents/TSTextUtils.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs b/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs index 0301e502cc4..93edc25bdd9 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs @@ -1139,8 +1139,8 @@ public static List GetFontInfoList(PropertyArray fontArray) // The following values from 'system-settings/libutil/sstu.c' private const float FontSizeScaleSmall = 0.87f; private const float FontSizeScaleNormal = 1.0f; - private const float FontSizeScaleLarge = 1.1f; - private const float FontSizeScaleHuge = 1.2f; + private const float FontSizeScaleLarge = 1.13f; + private const float FontSizeScaleHuge = 1.26f; private const float FontSizeScaleGiant = 1.4f; #endif diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs index f207012e337..69c3c0e9ad5 100755 --- a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs +++ b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs @@ -1034,19 +1034,19 @@ public void TextUtilsGetFontSizeScale() tlog.Debug(tag, $"TextUtilsGetFontSizeScale START"); var giant = TextUtils.GetFontSizeScale(System.SystemSettingsFontSize.Giant); - Assert.AreEqual(2.5f, giant, "Should be equal!"); + Assert.AreEqual(1.4f, giant, "Should be equal!"); var huge = TextUtils.GetFontSizeScale(System.SystemSettingsFontSize.Huge); - Assert.AreEqual(1.9f, huge, "Should be equal!"); + Assert.AreEqual(1.26f, huge, "Should be equal!"); var large = TextUtils.GetFontSizeScale(System.SystemSettingsFontSize.Large); - Assert.AreEqual(1.5f, large, "Should be equal!"); + Assert.AreEqual(1.13f, large, "Should be equal!"); var normal = TextUtils.GetFontSizeScale(System.SystemSettingsFontSize.Normal); Assert.AreEqual(1.0f, normal, "Should be equal!"); var small = TextUtils.GetFontSizeScale(System.SystemSettingsFontSize.Small); - Assert.AreEqual(0.8f, small, "Should be equal!"); + Assert.AreEqual(0.87f, small, "Should be equal!"); tlog.Debug(tag, $"TextUtilsGetFontSizeScale END (OK)"); }