From b9c49b8a3817d93a8f9c6d441cdbbf7633e6092d Mon Sep 17 00:00:00 2001 From: Wonyoung Choi Date: Fri, 7 Feb 2020 10:52:38 +0900 Subject: [PATCH] Sync upstream Change-Id: I9089d7a36979b15afba537d31ee4cdf85984a78f --- src/Tizen.NUI/Tizen.NUI.sln | 15 +-- .../src/public/BaseComponents/ImageView.cs | 11 -- .../src/public/BaseComponents/TextLabel.cs | 127 --------------------- src/Tizen.NUI/src/public/BaseComponents/View.cs | 8 +- src/Tizen.NUI/src/public/Key.cs | 5 - src/Tizen.NUI/src/public/PropertyValue.cs | 20 ---- .../Tizen.Sensor/SensorEnumerations.cs | 1 - 7 files changed, 5 insertions(+), 182 deletions(-) diff --git a/src/Tizen.NUI/Tizen.NUI.sln b/src/Tizen.NUI/Tizen.NUI.sln index 0f899d0..bcf6ac3 100755 --- a/src/Tizen.NUI/Tizen.NUI.sln +++ b/src/Tizen.NUI/Tizen.NUI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29519.87 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.NUI", "Tizen.NUI.csproj", "{473C3BEC-2F67-4285-85FC-BF4E96BFFF1C}" EndProject @@ -41,19 +41,8 @@ Global {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AEDCAA7-543F-48A1-BEA3-CF3E14F6EDC2}.Release|Any CPU.Build.0 = Release|Any CPU - {A9B4744E-EECC-44B6-8357-843DD20617EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9B4744E-EECC-44B6-8357-843DD20617EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9B4744E-EECC-44B6-8357-843DD20617EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9B4744E-EECC-44B6-8357-843DD20617EC}.Release|Any CPU.Build.0 = Release|Any CPU - {A3F5B81C-E1C9-4DC6-BC57-9682D300AE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3F5B81C-E1C9-4DC6-BC57-9682D300AE86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3F5B81C-E1C9-4DC6-BC57-9682D300AE86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3F5B81C-E1C9-4DC6-BC57-9682D300AE86}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {5E9D6A9F-1A8C-47A9-9666-0B1900CF03FD} - EndGlobalSection EndGlobal diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index f8fe66e..a6108bf 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -907,17 +907,6 @@ namespace Tizen.NUI.BaseComponents return new ImageViewStyle(); } - /// - /// Get attribues, it is abstract function and must be override. - /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - protected override ViewStyle GetViewStyle() - { - return new ImageViewStyle(); - } - internal void SetImage(string url, Uint16Pair size) { if(url.Contains(".json")) diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 635dc0a..53f7408 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -1473,133 +1473,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// Get attribues, it is abstract function and must be override. - /// - /// 6 - /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - protected override ViewStyle GetViewStyle() - { - return new TextLabelStyle(); - } - - internal static readonly BindableProperty TranslatableTextSelectorProperty = BindableProperty.Create("TranslatableTextSelector", typeof(Selector), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) => - { - var textLabel = (TextLabel)bindable; - textLabel.TranslatableTextSelector.Clone((Selector)newValue); - }, - defaultValueCreator: (bindable) => - { - var textLabel = (TextLabel)bindable; - return textLabel.TranslatableTextSelector; - }); - internal static readonly BindableProperty TextSelectorProperty = BindableProperty.Create("TextSelector", typeof(Selector), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) => - { - var textLabel = (TextLabel)bindable; - textLabel.textSelector.Clone((Selector)newValue); - }, - defaultValueCreator: (bindable) => - { - var textLabel = (TextLabel)bindable; - return textLabel.textSelector; - }); - internal static readonly BindableProperty FontFamilySelectorProperty = BindableProperty.Create("FontFamilySelector", typeof(Selector), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) => - { - var textLabel = (TextLabel)bindable; - textLabel.fontFamilySelector.Clone((Selector)newValue); - }, - defaultValueCreator: (bindable) => - { - var textLabel = (TextLabel)bindable; - return textLabel.fontFamilySelector; - }); - internal static readonly BindableProperty PointSizeSelectorProperty = BindableProperty.Create("PointSizeSelector", typeof(Selector), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) => - { - var textLabel = (TextLabel)bindable; - textLabel.pointSizeSelector.Clone((Selector)newValue); - }, - defaultValueCreator: (bindable) => - { - var textLabel = (TextLabel)bindable; - return textLabel.pointSizeSelector; - }); - internal static readonly BindableProperty TextColorSelectorProperty = BindableProperty.Create("TextColorSelector", typeof(Selector), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) => - { - var textLabel = (TextLabel)bindable; - textLabel.textColorSelector.Clone((Selector)newValue); - }, - defaultValueCreator: (bindable) => - { - var textLabel = (TextLabel)bindable; - return textLabel.textColorSelector; - }); - - private TriggerableSelector translatableTextSelector; - private TriggerableSelector TranslatableTextSelector - { - get - { - if (null == translatableTextSelector) - { - translatableTextSelector = new TriggerableSelector(this, TranslatableTextProperty); - } - return translatableTextSelector; - } - } - - private TriggerableSelector _textSelector; - private TriggerableSelector textSelector - { - get - { - if (null == _textSelector) - { - _textSelector = new TriggerableSelector(this, TextProperty); - } - return _textSelector; - } - } - - private TriggerableSelector _fontFamilySelector; - private TriggerableSelector fontFamilySelector - { - get - { - if (null == _fontFamilySelector) - { - _fontFamilySelector = new TriggerableSelector(this, FontFamilyProperty); - } - return _fontFamilySelector; - } - } - - private TriggerableSelector _textColorSelector; - private TriggerableSelector textColorSelector - { - get - { - if (null == _textColorSelector) - { - _textColorSelector = new TriggerableSelector(this, TextColorProperty); - } - return _textColorSelector; - } - } - - private TriggerableSelector _pointSizeSelector; - private TriggerableSelector pointSizeSelector - { - get - { - if (null == _pointSizeSelector) - { - _pointSizeSelector = new TriggerableSelector(this, PointSizeProperty); - } - return _pointSizeSelector; - } - } - - /// /// Invoked whenever the binding context of the textlabel changes. Implement this method to add class handling for this event. /// protected override void OnBindingContextChanged() diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 5045408..502a927 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -715,11 +715,6 @@ namespace Tizen.NUI.BaseComponents /// /// Retrieves and sets the view's opacity.
/// - /// - /// - /// Animatable - This property can be animated using Animation class. - /// - /// /// 3 public float Opacity { @@ -1255,6 +1250,9 @@ namespace Tizen.NUI.BaseComponents /// If the view is not visible, then the view and its children will not be rendered. /// This is regardless of the individual visibility values of the children, i.e., the view will only be rendered if all of its parents have visibility set to true. /// + /// + /// Animatable - This property can be animated using Animation class. + /// /// /// 3 public bool Visibility diff --git a/src/Tizen.NUI/src/public/Key.cs b/src/Tizen.NUI/src/public/Key.cs index cd49bb2..b85e130 100755 --- a/src/Tizen.NUI/src/public/Key.cs +++ b/src/Tizen.NUI/src/public/Key.cs @@ -344,11 +344,6 @@ namespace Tizen.NUI } get { - if (disposed) - { - NUILog.Error("[ERR] already disposed! cannot call native method! just return!"); - return (Key.StateType)(-1); - } Key.StateType ret = (Key.StateType)Interop.Key.Key_state_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/src/Tizen.NUI/src/public/PropertyValue.cs b/src/Tizen.NUI/src/public/PropertyValue.cs index 31cf35b..b0ea75d 100755 --- a/src/Tizen.NUI/src/public/PropertyValue.cs +++ b/src/Tizen.NUI/src/public/PropertyValue.cs @@ -669,25 +669,5 @@ namespace Tizen.NUI { return value == null ? new PropertyValue() : new PropertyValue(value); } - - internal static PropertyValue CreateWithGuard(string value) - { - return value == null ? new PropertyValue() : new PropertyValue(value); - } - - internal static PropertyValue CreateWithGuard(Vector2 value) - { - return value == null ? new PropertyValue() : new PropertyValue(value); - } - - internal static PropertyValue CreateWithGuard(Rectangle value) - { - return value == null ? new PropertyValue() : new PropertyValue(value); - } - - internal static PropertyValue CreateWithGuard(Color value) - { - return value == null ? new PropertyValue() : new PropertyValue(value); - } } } diff --git a/src/Tizen.Sensor/Tizen.Sensor/SensorEnumerations.cs b/src/Tizen.Sensor/Tizen.Sensor/SensorEnumerations.cs index abbdaaf..fe7020a 100755 --- a/src/Tizen.Sensor/Tizen.Sensor/SensorEnumerations.cs +++ b/src/Tizen.Sensor/Tizen.Sensor/SensorEnumerations.cs @@ -15,7 +15,6 @@ */ using System; -using System.ComponentModel; namespace Tizen.Sensor { -- 2.7.4