From ebf855c0a98dcb5d30e0bd8cddab44c867679a42 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 13 Dec 2022 12:38:10 +0900 Subject: [PATCH] [NUI] make Theme not be loaded in tv profile --- src/Tizen.NUI/Tizen.NUI.csproj | 4 ++++ src/Tizen.NUI/src/internal/Application/Application.cs | 1 + src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs | 2 +- src/Tizen.NUI/src/public/Input/FocusManager.cs | 1 + src/Tizen.NUI/src/public/Theme/ThemeManager.cs | 5 ++--- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index c07625b..d9c7ab5 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -4,6 +4,10 @@ $(NoWarn);CS0618;CS0809;CS1591;CA1054;CA1056 8.0 + + $(DefineConstants);NUI_DEBUG_OFF + + diff --git a/src/Tizen.NUI/src/internal/Application/Application.cs b/src/Tizen.NUI/src/internal/Application/Application.cs index 6901a24..e8ed832 100755 --- a/src/Tizen.NUI/src/internal/Application/Application.cs +++ b/src/Tizen.NUI/src/internal/Application/Application.cs @@ -672,6 +672,7 @@ namespace Tizen.NUI Tizen.Tracer.Begin("[NUI] OnApplicationInit: GetWindow"); Window.Instance = GetWindow(); #if !PROFILE_TV + //tv profile never use default focus indicator, so this is not needed! _ = FocusManager.Instance; #endif Tizen.Tracer.End(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs index 5e64ac1..2bf18e4 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs @@ -1561,7 +1561,7 @@ namespace Tizen.NUI.BaseComponents protected virtual void InitializeStyle(ViewStyle style = null) { #if PROFILE_TV - Tizen.Log.Info("NUI", $"InitializeStyle() just return here in PROFILE_TV"); + // tv profile doesn't use NUI Style, so do nothing and just return here! return; #endif var initialStyle = ThemeManager.GetInitialStyleWithoutClone(GetType()); diff --git a/src/Tizen.NUI/src/public/Input/FocusManager.cs b/src/Tizen.NUI/src/public/Input/FocusManager.cs index 66392d7..7cf7383 100755 --- a/src/Tizen.NUI/src/public/Input/FocusManager.cs +++ b/src/Tizen.NUI/src/public/Input/FocusManager.cs @@ -584,6 +584,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); #if !PROFILE_TV + //tv profile never use default focus indicator, so this is not needed! ret.FocusIndicator = ret.GetDefaultFocusIndicator(); #endif return ret; diff --git a/src/Tizen.NUI/src/public/Theme/ThemeManager.cs b/src/Tizen.NUI/src/public/Theme/ThemeManager.cs index 96710ec..615edbe 100755 --- a/src/Tizen.NUI/src/public/Theme/ThemeManager.cs +++ b/src/Tizen.NUI/src/public/Theme/ThemeManager.cs @@ -54,10 +54,9 @@ namespace Tizen.NUI static ThemeManager() { #if ExternalThemeEnabled - Tizen.Log.Info("NUI", $"must not be shown in PROFILE_TV"); ExternalThemeManager.Initialize(); -#endif AddPackageTheme(DefaultThemeCreator.Instance); +#endif } /// @@ -354,7 +353,7 @@ namespace Tizen.NUI internal static void AddPackageTheme(IThemeCreator themeCreator) { #if PROFILE_TV - Tizen.Log.Info("NUI", $"PROFILE_TV AddPackageTheme()"); + // for tv profile, set empty theme and just return here! userTheme = null; baseTheme = themeCreator.Create(); return; -- 2.7.4