From 9e9cb411c582074c7e039224225369112f2ef5b3 Mon Sep 17 00:00:00 2001 From: Feng Jin Date: Mon, 10 Apr 2017 19:52:33 +0800 Subject: [PATCH] Manual merge for nui v0.2.34 Change-Id: Icde14aa3d15981ef6a831940060d61b3da73462b Signed-off-by: Feng Jin --- .../firstscreen/ScrollContainer.cs | 4 +-- .../src/internal/CustomAlgorithmInterface.cs | 6 +++- src/Tizen.NUI/src/internal/ManualPINVOKE.cs | 3 ++ src/Tizen.NUI/src/internal/NDalic.cs | 5 ++-- src/Tizen.NUI/src/internal/NDalicPINVOKE.cs | 34 +++++++++------------- .../SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs | 29 ------------------ src/Tizen.NUI/src/internal/TimerSignalType.cs | 6 +++- src/Tizen.NUI/src/internal/ToggleButton.cs | 6 +++- src/Tizen.NUI/src/internal/TransitionData.cs | 6 +++- src/Tizen.NUI/src/internal/ViewWrapperImpl.cs | 7 ++++- src/Tizen.NUI/src/internal/VisualType.cs | 5 +++- src/Tizen.NUI/src/public/VisualBase.cs | 7 ++++- src/Tizen.NUI/src/public/VisualMaps.cs | 1 + src/Tizen.NUI/src/public/Window.cs | 7 ----- 14 files changed, 59 insertions(+), 67 deletions(-) delete mode 100755 src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs index 0164b9a..a5129f5 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs @@ -318,7 +318,7 @@ namespace FirstScreen // This override function supports two dimensional keyboard navigation. // This function returns the next keyboard focusable actor in ScrollContainer control towards the given direction. - public override View GetNextKeyboardFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled) + public override View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled) { if (direction == View.FocusDirection.Left) { @@ -334,7 +334,7 @@ namespace FirstScreen } } - public override void OnKeyboardFocusChangeCommitted(View commitedFocusableView) + public override void OnFocusChangeCommitted(View commitedFocusableView) { Focus(_focusedItem); } diff --git a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs index 4ac3920..9fcc50b 100755 --- a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs +++ b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs @@ -29,10 +29,14 @@ internal class CustomAlgorithmInterface : global::System.IDisposable { } ~CustomAlgorithmInterface() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Stage.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs index 1a19d4b..a70ec5c 100755 --- a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs @@ -271,6 +271,9 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Visual_Property_MIX_COLOR_get")] public static extern int Visual_Property_MIX_COLOR_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Image_Visual_BORDER_get")] + public static extern int Image_Visual_BORDER_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_NativeVersionCheck")] public static extern bool NativeVersionCheck(ref int ver1, ref int ver2, ref int ver3); diff --git a/src/Tizen.NUI/src/internal/NDalic.cs b/src/Tizen.NUI/src/internal/NDalic.cs index 8168d23..3149f6e 100755 --- a/src/Tizen.NUI/src/internal/NDalic.cs +++ b/src/Tizen.NUI/src/internal/NDalic.cs @@ -21,6 +21,7 @@ namespace Tizen.NUI { public static readonly int VISUAL_PROPERTY_TRANSFORM = NDalicManualPINVOKE.Visual_Property_TRANSFORM_get(); public static readonly int VISUAL_PROPERTY_PREMULTIPLIED_ALPHA = NDalicManualPINVOKE.Visual_Property_PREMULTIPLIED_ALPHA_get(); public static readonly int VISUAL_PROPERTY_MIX_COLOR = NDalicManualPINVOKE.Visual_Property_MIX_COLOR_get(); + public static readonly int IMAGE_VISUAL_BORDER = NDalicManualPINVOKE.Image_Visual_BORDER_get(); public static void DaliAssertMessage(string location, string condition) { NDalicPINVOKE.DaliAssertMessage(location, condition); @@ -1013,8 +1014,8 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static SWIGTYPE_p_Dali__SignalT_void_fboolF_t FocusChangedSignal(Window window) { - SWIGTYPE_p_Dali__SignalT_void_fboolF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fboolF_t(NDalicPINVOKE.FocusChangedSignal(Window.getCPtr(window)), false); + public static WindowFocusSignalType FocusChangedSignal(Window window) { + WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(Window.getCPtr(window)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index bce283d..b2274c8 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -6155,9 +6155,6 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_GetNativeHandle")] public static extern global::System.IntPtr Window_GetNativeHandle(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_IndicatorVisibilityChangedSignal")] - public static extern global::System.IntPtr Window_IndicatorVisibilityChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_FocusChangedSignal")] public static extern global::System.IntPtr FocusChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -6338,29 +6335,26 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_TimerSignalType")] public static extern void delete_TimerSignalType(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Empty")] + public static extern bool WindowFocusSignalType_Empty(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Empty")] - public static extern bool WindowFocusSignalType_Empty(global::System.Runtime.InteropServices.HandleRef jarg1); - - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_GetConnectionCount")] - public static extern uint WindowFocusSignalType_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1); - - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Connect")] - public static extern void WindowFocusSignalType_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Disconnect")] - public static extern void WindowFocusSignalType_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_GetConnectionCount")] + public static extern uint WindowFocusSignalType_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Emit")] - public static extern void WindowFocusSignalType_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Connect")] + public static extern void WindowFocusSignalType_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_new_WindowFocusSignalType")] - public static extern global::System.IntPtr new_WindowFocusSignalType(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Disconnect")] + public static extern void WindowFocusSignalType_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_delete_WindowFocusSignalType")] - public static extern void delete_WindowFocusSignalType(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_WindowFocusSignalType_Emit")] + public static extern void WindowFocusSignalType_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_new_WindowFocusSignalType")] + public static extern global::System.IntPtr new_WindowFocusSignalType(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_delete_WindowFocusSignalType")] + public static extern void delete_WindowFocusSignalType(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VISUAL_PROPERTY_TYPE_get")] public static extern int VISUAL_PROPERTY_TYPE_get(); diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs deleted file mode 100755 index c1b1a5b..0000000 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs +++ /dev/null @@ -1,29 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Tizen.NUI { - - internal class SWIGTYPE_p_Dali__SignalT_void_fboolF_t { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - - internal SWIGTYPE_p_Dali__SignalT_void_fboolF_t(global::System.IntPtr cPtr, bool futureUse) { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_Dali__SignalT_void_fboolF_t() { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Dali__SignalT_void_fboolF_t obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } -} - -} diff --git a/src/Tizen.NUI/src/internal/TimerSignalType.cs b/src/Tizen.NUI/src/internal/TimerSignalType.cs index 6b31a11..34b1d06 100755 --- a/src/Tizen.NUI/src/internal/TimerSignalType.cs +++ b/src/Tizen.NUI/src/internal/TimerSignalType.cs @@ -25,10 +25,14 @@ namespace Tizen.NUI { } ~TimerSignalType() { - Dispose(); + DisposeQueue.Instance.Add(this); } public virtual void Dispose() { + if (!Stage.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/ToggleButton.cs b/src/Tizen.NUI/src/internal/ToggleButton.cs index ad8697a..b3f5ad1 100755 --- a/src/Tizen.NUI/src/internal/ToggleButton.cs +++ b/src/Tizen.NUI/src/internal/ToggleButton.cs @@ -38,10 +38,14 @@ public class ToggleButton : Button { } ~ToggleButton() { - Dispose(); + DisposeQueue.Instance.Add(this); } public override void Dispose() { + if (!Stage.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/TransitionData.cs b/src/Tizen.NUI/src/internal/TransitionData.cs index f927eea..74ea147 100755 --- a/src/Tizen.NUI/src/internal/TransitionData.cs +++ b/src/Tizen.NUI/src/internal/TransitionData.cs @@ -38,10 +38,14 @@ public class TransitionData : BaseHandle { } ~TransitionData() { - Dispose(); + DisposeQueue.Instance.Add(this); } public override void Dispose() { + if (!Stage.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) { diff --git a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs index 39735de..ad95507 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -110,11 +110,16 @@ namespace Tizen.NUI ~ViewWrapperImpl() { - Dispose(); + DisposeQueue.Instance.Add(this); } public override void Dispose() { + if (!Stage.IsInstalled()) + { + DisposeQueue.Instance.Add(this); + return; + } lock(this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/internal/VisualType.cs b/src/Tizen.NUI/src/internal/VisualType.cs index 81164c4..2c97737 100755 --- a/src/Tizen.NUI/src/internal/VisualType.cs +++ b/src/Tizen.NUI/src/internal/VisualType.cs @@ -20,7 +20,10 @@ namespace Tizen.NUI { WIREFRAME , - TEXT + TEXT, + N_PATCH, + SVG, + ANIMATED_IMAGE } } diff --git a/src/Tizen.NUI/src/public/VisualBase.cs b/src/Tizen.NUI/src/public/VisualBase.cs index 990774f..155dca8 100755 --- a/src/Tizen.NUI/src/public/VisualBase.cs +++ b/src/Tizen.NUI/src/public/VisualBase.cs @@ -33,11 +33,16 @@ namespace Tizen.NUI ~VisualBase() { - Dispose(); + DisposeQueue.Instance.Add(this); } public override void Dispose() { + if (!Stage.IsInstalled()) + { + DisposeQueue.Instance.Add(this); + return; + } lock (this) { if (swigCPtr.Handle != global::System.IntPtr.Zero) diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs index 51fc626..fdacb8c 100755 --- a/src/Tizen.NUI/src/public/VisualMaps.cs +++ b/src/Tizen.NUI/src/public/VisualMaps.cs @@ -1630,6 +1630,7 @@ namespace Tizen.NUI public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA; public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U; public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V; + public static readonly int Border = NDalic.IMAGE_VISUAL_BORDER; } /// diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index 2322e1d..eb741e9 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -346,13 +346,6 @@ namespace Tizen.NUI return ret; } - internal SWIGTYPE_p_Dali__SignalT_void_fboolF_t IndicatorVisibilityChangedSignal() - { - SWIGTYPE_p_Dali__SignalT_void_fboolF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fboolF_t(NDalicPINVOKE.Window_IndicatorVisibilityChangedSignal(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Enumeration for orientation of the window is the way in which a rectangular page is oriented for normal viewing. /// -- 2.7.4