From 875a49133abbd326ae98d837a3bec14925af0290 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Fri, 8 Sep 2023 14:00:49 +0900 Subject: [PATCH] [Non-ACR][NUI][Fix large text size problem in emul] Change-Id: I9460baefbb441b5a6d9494234118c4511df820dd --- .../Tizen.NUI.Manual.Tests/ManualTestPage.cs | 8 +++++++ tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs | 26 ++++++++++++++-------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs index 3bfec75..03f77e8 100755 --- a/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs +++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs @@ -266,6 +266,10 @@ namespace Tizen.NUI.Tests btn.Feedback = false; btn.PointSize = _pointSize; float buttonWidth = ManualTest.IsMobile() ? Window.Instance.Size.Width * 0.18f : Window.Instance.Size.Width * 0.06f; + if (ManualTest.IsEmulator()) + { + buttonWidth = Window.Instance.Size.Width * 0.16f; + } btn.Size = new Size(buttonWidth, Window.Instance.Size.Height * 0.046f); btn.TextColor = new Color(0, 0, 0, 1); btn.ImageShadow = new ImageShadow @@ -514,6 +518,10 @@ namespace Tizen.NUI.Tests _notRun.PointSize = _pointSize; _notRun.Text = "Not Run"; float buttonWidth = ManualTest.IsMobile() ? Window.Instance.Size.Width * 0.18f : Window.Instance.Size.Width * 0.06f; + if (ManualTest.IsEmulator()) + { + buttonWidth = Window.Instance.Size.Width * 0.16f; + } _notRun.Size = new Size(buttonWidth, Window.Instance.Size.Height * 0.046f); _passButton = new Button(); diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs index ed25d35..e347bf6 100755 --- a/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs +++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs @@ -21,8 +21,8 @@ using System.Collections.Generic; using System.ComponentModel; using Tizen.NUI.BaseComponents; using Tizen.NUI; -using Tizen.NUI.Components; - +using Tizen.NUI.Components; + namespace Tizen.NUI.Tests { @@ -178,12 +178,12 @@ namespace Tizen.NUI.Tests } if (ManualTest.IsWearable()) - { - WearableManualTestNUI.GetInstance().UnlockUIButton(); + { + WearableManualTestNUI.GetInstance().UnlockUIButton(); } - else - { - ManualTestNUI.GetInstance().UnlockUIButton(); + else + { + ManualTestNUI.GetInstance().UnlockUIButton(); } } @@ -231,13 +231,14 @@ namespace Tizen.NUI.Tests } return false; - } - + } + public static float GetPointSize() { float retValue = 10.0f; //default string value; Tizen.System.Information.TryGetValue("tizen.org/feature/profile", out value); + Tizen.Log.Debug("NUITC", $"GetPointSize() value={value}"); switch (value) { case "wearable": @@ -250,6 +251,13 @@ namespace Tizen.NUI.Tests retValue = 20.0f; break; } + + if (ManualTest.IsEmulator()) + { + retValue = 4.5f; + } + + Tizen.Log.Debug("NUITC", $"GetPointSize() retValue={retValue}"); return retValue; } -- 2.7.4