From e1d57e263b6fca86cdc31a6b98ed96c4aeead2fb Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Thu, 8 Dec 2022 08:51:00 +0900 Subject: [PATCH] [NUI] set default theme for TV profile --- src/Tizen.NUI/src/public/Application/NUIApplication.cs | 3 +++ src/Tizen.NUI/src/public/Input/FocusManager.cs | 2 ++ src/Tizen.NUI/src/public/Theme/DefaultThemeTV.cs | 2 ++ src/Tizen.NUI/src/public/Theme/ThemeManager.cs | 6 ++++++ 4 files changed, 13 insertions(+) diff --git a/src/Tizen.NUI/src/public/Application/NUIApplication.cs b/src/Tizen.NUI/src/public/Application/NUIApplication.cs index d592799..e83d75c 100755 --- a/src/Tizen.NUI/src/public/Application/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/Application/NUIApplication.cs @@ -14,6 +14,9 @@ * limitations under the License. * */ +#if !PROFILE_TV +#define ExternalThemeEnabled +#endif using System; using System.ComponentModel; diff --git a/src/Tizen.NUI/src/public/Input/FocusManager.cs b/src/Tizen.NUI/src/public/Input/FocusManager.cs index b404308..66392d7 100755 --- a/src/Tizen.NUI/src/public/Input/FocusManager.cs +++ b/src/Tizen.NUI/src/public/Input/FocusManager.cs @@ -583,7 +583,9 @@ namespace Tizen.NUI FocusManager ret = new FocusManager(Interop.FocusManager.Get(), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); +#if !PROFILE_TV ret.FocusIndicator = ret.GetDefaultFocusIndicator(); +#endif return ret; } diff --git a/src/Tizen.NUI/src/public/Theme/DefaultThemeTV.cs b/src/Tizen.NUI/src/public/Theme/DefaultThemeTV.cs index 772a5db..89646fb 100644 --- a/src/Tizen.NUI/src/public/Theme/DefaultThemeTV.cs +++ b/src/Tizen.NUI/src/public/Theme/DefaultThemeTV.cs @@ -23,6 +23,8 @@ namespace Tizen.NUI { public Theme Create() { + Tizen.Log.Info("NUI", $"PROFILE_TV DefaultThemeCreator.Create()"); + Theme theme = new Theme() { Id = DefaultId, diff --git a/src/Tizen.NUI/src/public/Theme/ThemeManager.cs b/src/Tizen.NUI/src/public/Theme/ThemeManager.cs index 7d351a5..0b6d66f 100755 --- a/src/Tizen.NUI/src/public/Theme/ThemeManager.cs +++ b/src/Tizen.NUI/src/public/Theme/ThemeManager.cs @@ -352,6 +352,12 @@ namespace Tizen.NUI internal static void AddPackageTheme(IThemeCreator themeCreator) { +#if PROFILE_TV + Tizen.Log.Info("NUI", $"PROFILE_TV AddPackageTheme()"); + userTheme = null; + baseTheme = themeCreator.Create(); + return; +#endif if (packages.Contains(themeCreator)) { return; -- 2.7.4