From ebf2a0c2bbc9b5c6123305676177cad0d4d073c7 Mon Sep 17 00:00:00 2001 From: Wonyoung Choi Date: Wed, 18 Nov 2020 18:18:09 +0900 Subject: [PATCH] Release 9.0.0.15689 Change-Id: I5e9aab831018a4b668f1b1dda476795ab318ba20 --- packaging/csapi-tizenfx.spec | 6 +- .../src/internal/Layouting/GridLocations.cs | 8 +-- src/Tizen.NUI/src/public/Layouting/GridLayout.cs | 4 +- src/Tizen.NUI/src/public/Timer.cs | 73 ---------------------- 4 files changed, 8 insertions(+), 83 deletions(-) diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 0824e7f..b82f648 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -1,8 +1,8 @@ # Auto-generated from csapi-tizenfx.spec.in by makespec.sh %define TIZEN_NET_API_VERSION 9 -%define TIZEN_NET_RPM_VERSION 9.0.0.999+nui21932 -%define TIZEN_NET_NUGET_VERSION 9.0.0.99999 +%define TIZEN_NET_RPM_VERSION 9.0.0.15689+nui21932 +%define TIZEN_NET_NUGET_VERSION 9.0.0.15689 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref @@ -16,8 +16,6 @@ %define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts -%define UPGRADE_SCRIPT_PATH /usr/share/upgrade/scripts - Name: csapi-tizenfx Summary: Assemblies of Tizen .NET Version: %{TIZEN_NET_RPM_VERSION} diff --git a/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs b/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs index e9299de..7a72159 100755 --- a/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs +++ b/src/Tizen.NUI/src/internal/Layouting/GridLocations.cs @@ -196,14 +196,14 @@ namespace Tizen.NUI // assign column/row depending on GridOrientation. The main axis count(Columns on Horizontal, Rows otherwise) won't be exceeded // explicit column(row) count which is assigned by Columns(Rows). but, cross axis count(Rows(Columns)) can be increased by sub axis count. - if (column == AutoColumn || row == AutoRow) + if (column == CellUndefined || row == CellUndefined) { (int point, int span) mainAxis = isHorizontal ? (column, columnSpan) : (row, rowSpan); (int point, int span) subAxis = isHorizontal ? (row, rowSpan) : (column, columnSpan); - if (subAxis.point != AutoColumn && subAxis.point != AutoRow) + if (subAxis.point != CellUndefined) subPivot = subAxis.point; - if (mainAxis.point != AutoColumn && mainAxis.point != AutoRow) + if (mainAxis.point != CellUndefined) mainPivot = mainAxis.point; if (mainPivot + mainAxis.span > pivotStack.Length) @@ -221,7 +221,7 @@ namespace Tizen.NUI if (n > pivotStack.Length) { - if (mainAxis.point != AutoColumn && mainAxis.point != AutoRow) + if (mainAxis.point != CellUndefined) mainPivot = mainAxis.point; else mainPivot = 0; diff --git a/src/Tizen.NUI/src/public/Layouting/GridLayout.cs b/src/Tizen.NUI/src/public/Layouting/GridLayout.cs index 2b14ba1..0bb0010 100755 --- a/src/Tizen.NUI/src/public/Layouting/GridLayout.cs +++ b/src/Tizen.NUI/src/public/Layouting/GridLayout.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI /// ColumnProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty ColumnProperty = BindableProperty.CreateAttached("Column", typeof(int), typeof(GridLayout), AutoColumn, validateValue: (bindable, value) => (int)value >= 0 || (int)value == AutoColumn, propertyChanged: OnChildPropertyChanged); + public static readonly BindableProperty ColumnProperty = BindableProperty.CreateAttached("Column", typeof(int), typeof(GridLayout), CellUndefined, validateValue: (bindable, value) => (int)value >= 0, propertyChanged: OnChildPropertyChanged); /// /// ColumnSpanProperty @@ -42,7 +42,7 @@ namespace Tizen.NUI /// RowProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty RowProperty = BindableProperty.CreateAttached("Row", typeof(int), typeof(GridLayout), AutoRow, validateValue: (bindable, value) => (int)value >= 0 || (int)value == AutoRow, propertyChanged: OnChildPropertyChanged); + public static readonly BindableProperty RowProperty = BindableProperty.CreateAttached("Row", typeof(int), typeof(GridLayout), CellUndefined, validateValue: (bindable, value) => (int)value >= 0, propertyChanged: OnChildPropertyChanged); /// /// RowSpanProperty diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs index 3338616..134d71a 100755 --- a/src/Tizen.NUI/src/public/Timer.cs +++ b/src/Tizen.NUI/src/public/Timer.cs @@ -49,18 +49,6 @@ namespace Tizen.NUI /// 3 public Timer(uint milliSec) : this(Interop.Timer.Timer_New(milliSec), true) { - if (Thread.CurrentThread.ManagedThreadId != 1) - { - Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId); - - StackTrace st = new StackTrace(true); - for (int i = 0; i < st.FrameCount; i++) - { - StackFrame sf = st.GetFrame(i); - Tizen.Log.Error("NUI", " Method " + sf.GetMethod()); - } - } - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); NUILog.Debug($"(0x{swigCPtr.Handle:X}) Timer({milliSec}) Constructor!"); @@ -99,19 +87,6 @@ namespace Tizen.NUI { add { - if (Thread.CurrentThread.ManagedThreadId != 1) - { - Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId); - - StackTrace st = new StackTrace(true); - for (int i = 0; i < st.FrameCount; i++) - { - StackFrame sf = st.GetFrame(i); - Tizen.Log.Error("NUI", " Method " + sf.GetMethod()); - } - } - - if (_timerTickEventHandler == null && disposed == false) { TickSignal().Connect(_timerTickCallbackOfNative); @@ -120,18 +95,6 @@ namespace Tizen.NUI } remove { - if (Thread.CurrentThread.ManagedThreadId != 1) - { - Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId); - - StackTrace st = new StackTrace(true); - for (int i = 0; i < st.FrameCount; i++) - { - StackFrame sf = st.GetFrame(i); - Tizen.Log.Error("NUI", " Method " + sf.GetMethod()); - } - } - _timerTickEventHandler -= value; if (_timerTickEventHandler == null && TickSignal().Empty() == false) { @@ -151,34 +114,10 @@ namespace Tizen.NUI { get { - if (Thread.CurrentThread.ManagedThreadId != 1) - { - Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId); - - StackTrace st = new StackTrace(true); - for (int i = 0; i < st.FrameCount; i++) - { - StackFrame sf = st.GetFrame(i); - Tizen.Log.Error("NUI", " Method " + sf.GetMethod()); - } - } - return GetInterval(); } set { - if (Thread.CurrentThread.ManagedThreadId != 1) - { - Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId); - - StackTrace st = new StackTrace(true); - for (int i = 0; i < st.FrameCount; i++) - { - StackFrame sf = st.GetFrame(i); - Tizen.Log.Error("NUI", " Method " + sf.GetMethod()); - } - } - SetInterval(value); } } @@ -327,18 +266,6 @@ namespace Tizen.NUI /// 3 protected override void Dispose(DisposeTypes type) { - if (Thread.CurrentThread.ManagedThreadId != 1) - { - Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId); - - StackTrace st = new StackTrace(true); - for (int i = 0; i < st.FrameCount; i++) - { - StackFrame sf = st.GetFrame(i); - Tizen.Log.Error("NUI", " Method " + sf.GetMethod()); - } - } - NUILog.Debug($"(0x{swigCPtr.Handle:X}) Timer.Dispose(type={type}, disposed={disposed})"); if (this != null && _timerTickCallbackDelegate != null) -- 2.7.4