From 83d151c8528a9d0860cb984849855ac17ff97682 Mon Sep 17 00:00:00 2001 From: Jiyun Yang Date: Mon, 20 Jul 2020 15:25:15 +0900 Subject: [PATCH] [NUI] Remove Style from View (#1837) Signed-off-by: Jiyun Yang --- src/Tizen.NUI.Components/Controls/Control.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/ImageView.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/TextField.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/View.cs | 10 ---------- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/Tizen.NUI.Components/Controls/Control.cs b/src/Tizen.NUI.Components/Controls/Control.cs index 60575ad..fc3abce 100755 --- a/src/Tizen.NUI.Components/Controls/Control.cs +++ b/src/Tizen.NUI.Components/Controls/Control.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI.Components /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public new ControlStyle Style => (ControlStyle)ViewStyle.Clone(); + public ControlStyle Style => (ControlStyle)ViewStyle.Clone(); static Control() { } diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index 0985953..a4049b6 100644 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -271,7 +271,7 @@ namespace Tizen.NUI.BaseComponents /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public new ImageViewStyle Style => new ImageViewStyle(this); + public ImageViewStyle Style => new ImageViewStyle(this); /// /// Creates an initialized ImageView. diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index a2849ea..2eb09c6 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -40,7 +40,7 @@ namespace Tizen.NUI.BaseComponents /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public new TextFieldStyle Style => new TextFieldStyle(this); + public TextFieldStyle Style => new TextFieldStyle(this); /// /// Creates the TextField control. diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 1b2757c..24dcee8 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -46,7 +46,7 @@ namespace Tizen.NUI.BaseComponents /// Style setting is possible by using constructor or the function of . /// [EditorBrowsable(EditorBrowsableState.Never)] - public new TextLabelStyle Style => new TextLabelStyle(this); + public TextLabelStyle Style => new TextLabelStyle(this); /// /// Creates the TextLabel control. diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 2af0d11..8ceee29 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -67,16 +67,6 @@ namespace Tizen.NUI.BaseComponents static View() {} - - /// - /// Return a copied Style instance of View. - /// - /// - /// It returns copied Style instance and changing it does not effect to the View. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public ViewStyle Style => new ViewStyle(this); - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] public ViewStyle ViewStyle -- 2.7.4