From 3980deb81b2f31e4e0c194bb2dc2f01af7297aad Mon Sep 17 00:00:00 2001 From: "xb.teng" Date: Wed, 17 May 2017 02:28:04 +0800 Subject: [PATCH] manual merge for nui 0.2.39 Change-Id: I3b866f762b9e26a4a96c5a72810ee7a5e7add6e0 --- packaging/csapi-nui.spec | 2 +- src/Tizen.NUI/src/internal/Application.cs | 4 +- src/Tizen.NUI/src/internal/NDalicPINVOKE.cs | 54 ++++++ src/Tizen.NUI/src/public/NUIConstants.cs | 81 +++++++++ src/Tizen.NUI/src/public/Window.cs | 187 ++++++++++++++++++++ 5 files changed, 325 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/Tizen.NUI/src/internal/Application.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/NUIConstants.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/Window.cs diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index a3f9582a7..30c0de0d1 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -1,6 +1,6 @@ Name: csapi-nui Summary: dali-NUI -Version: 0.2.38 +Version: 0.2.39 Release: 1 Group: Development/Libraries License: Apache-2.0 and BSD-3-Clause and MIT diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs old mode 100644 new mode 100755 index f136a58de..885de014f --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -19,10 +19,10 @@ namespace Tizen.NUI { public const int ver1 = 1; public const int ver2 = 2; - public const int ver3 = 38; + public const int ver3 = 39; public const int nuiVer1 = 0; public const int nuiVer2 = 2; - public const int nuiVer3 = 38; + public const int nuiVer3 = 39; public const string nuiRelease = ""; } diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index ac7a9b441..626880355 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -6208,6 +6208,60 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IsVisible")] public static extern bool IsVisible(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetSupportedAuxiliaryHintCount")] + public static extern uint GetSupportedAuxiliaryHintCount(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetSupportedAuxiliaryHint")] + public static extern string GetSupportedAuxiliaryHint(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_AddAuxiliaryHint")] + public static extern uint AddAuxiliaryHint(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RemoveAuxiliaryHint")] + public static extern bool RemoveAuxiliaryHint(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetAuxiliaryHintValue")] + public static extern bool SetAuxiliaryHintValue(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2, string jarg3); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetAuxiliaryHintValue")] + public static extern string GetAuxiliaryHintValue(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetAuxiliaryHintId")] + public static extern uint GetAuxiliaryHintId(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetInputRegion")] + public static extern void SetInputRegion(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetType")] + public static extern void SetType(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetType")] + public static extern int GetType(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetNotificationLevel")] + public static extern bool SetNotificationLevel(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetNotificationLevel")] + public static extern int GetNotificationLevel(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetOpaqueState")] + public static extern void SetOpaqueState(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IsOpaqueState")] + public static extern bool IsOpaqueState(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetScreenMode")] + public static extern bool SetScreenMode(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetScreenMode")] + public static extern int GetScreenMode(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetBrightness")] + public static extern bool SetBrightness(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetBrightness")] + public static extern int GetBrightness(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_New__SWIG_0")] public static extern global::System.IntPtr Application_New__SWIG_0(); diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs old mode 100644 new mode 100755 index b2953e641..a09b96d62 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -1229,4 +1229,85 @@ namespace Tizen.NUI } } } + + /// + /// Auto scrolling stop behaviour. + /// + public enum AutoScrollStopMode + { + /// + /// Stop animation after current loop finished. + /// + FinishLoop, + /// + /// Stop animation immediatly and reset position. + /// + Immediate + } + + /// + /// An enum of screen mode. + /// + public enum ScreenModeType { + /// + /// The mode which turns the screen off after a timeout. + /// + Default, + /// + /// The mode which keeps the screen turned on. + /// + AlwaysOn + } + + /// + /// An enum of notification window's priority level. + /// + public enum NotificationLevelType { + /// + /// No notification level.
+ /// Default level.
+ /// This value makes the notification window place in the layer of the normal window. + /// + None = -1, + /// + /// Base nofitication level. + /// + Base = 10, + /// + /// Medium notification level than base. + /// + Medium = 20, + /// + /// Higher notification level than medium. + /// + High = 30, + /// + /// The highest notification level. + /// + Top = 40 + } + + /// + /// An enum of Window types. + /// + public enum WindowType { + /// + /// A default window type.
+ /// Indicates a normal, top-level window. + /// Almost every window will be created with this type. + /// + Normal, + /// + /// A notification window, like a warning about battery life or a new E-Mail received. + /// + Notification, + /// + /// A persistent utility window, like a toolbox or palette. + /// + Utility, + /// + /// Used for simple dialog windows. + /// + Dialog + } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs old mode 100644 new mode 100755 index 4a0431296..55c3e3d53 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -140,6 +140,193 @@ namespace Tizen.NUI return temp; } + /// + /// Gets the count of supported auxiliary hints of the window. + /// + /// The number of supported auxiliary hints. + public uint GetSupportedAuxiliaryHintCount() { + uint ret = NDalicPINVOKE.GetSupportedAuxiliaryHintCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets the supported auxiliary hint string of the window. + /// + /// The index of the supported auxiliary hint lists. + /// The auxiliary hint string of the index. + public string GetSupportedAuxiliaryHint(uint index) { + string ret = NDalicPINVOKE.GetSupportedAuxiliaryHint(swigCPtr, index); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Creates an auxiliary hint of the window. + /// + /// The auxiliary hint string. + /// The value string. + /// The ID of created auxiliary hint, or 0 on failure. + public uint AddAuxiliaryHint(string hint, string value) { + uint ret = NDalicPINVOKE.AddAuxiliaryHint(swigCPtr, hint, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Removes an auxiliary hint of the window. + /// + /// The ID of the auxiliary hint. + /// True if no error occurred, false otherwise. + public bool RemoveAuxiliaryHint(uint id) { + bool ret = NDalicPINVOKE.RemoveAuxiliaryHint(swigCPtr, id); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Changes a value of the auxiliary hint. + /// + /// The auxiliary hint ID. + /// The value string to be set. + /// True if no error occurred, false otherwise. + public bool SetAuxiliaryHintValue(uint id, string value) { + bool ret = NDalicPINVOKE.SetAuxiliaryHintValue(swigCPtr, id, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets a value of the auxiliary hint. + /// + /// The auxiliary hint ID. + /// The string value of the auxiliary hint ID, or an empty string if none exists. + public string GetAuxiliaryHintValue(uint id) { + string ret = NDalicPINVOKE.GetAuxiliaryHintValue(swigCPtr, id); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets an ID of the auxiliary hint string. + /// + /// The auxiliary hint string. + /// The ID of auxiliary hint string, or 0 on failure. + public uint GetAuxiliaryHintId(string hint) { + uint ret = NDalicPINVOKE.GetAuxiliaryHintId(swigCPtr, hint); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Sets a region to accept input events. + /// + /// The region to accept input events. + public void SetInputRegion(Rectangle inputRegion) { + NDalicPINVOKE.SetInputRegion(swigCPtr, Rectangle.getCPtr(inputRegion)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Gets/Sets a window type. + /// + public WindowType Type + { + get + { + WindowType ret = (WindowType)NDalicPINVOKE.GetType(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + set + { + NDalicPINVOKE.SetType(swigCPtr, (int)value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + /// + /// Sets a priority level for the specified notification window. + /// + /// The notification window level. + /// True if no error occurred, false otherwise. + public bool SetNotificationLevel(NotificationLevelType level) { + bool ret = NDalicPINVOKE.SetNotificationLevel(swigCPtr, (int)level); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets a priority level for the specified notification window. + /// + /// The notification window level. + public NotificationLevelType GetNotificationLevel() { + NotificationLevelType ret = (NotificationLevelType)NDalicPINVOKE.GetNotificationLevel(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Sets a transparent window's visual state to opaque. + /// + /// Whether the window's visual state is opaque. + public void SetOpaqueState(bool opaque) { + NDalicPINVOKE.SetOpaqueState(swigCPtr, opaque); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Returns whether a transparent window's visual state is opaque or not. + /// + /// True if the window's visual state is opaque, false otherwise. + public bool IsOpaqueState() { + bool ret = NDalicPINVOKE.IsOpaqueState(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Sets a window's screen mode. + /// + /// The screen mode. + /// True if no error occurred, false otherwise. + public bool SetScreenMode(ScreenModeType screenMode) { + bool ret = NDalicPINVOKE.SetScreenMode(swigCPtr, (int)screenMode); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets a screen mode of the window. + /// + /// The screen mode. + public ScreenModeType GetScreenMode() { + ScreenModeType ret = (ScreenModeType)NDalicPINVOKE.GetScreenMode(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Sets preferred brightness of the window. + /// + /// The preferred brightness (0 to 100). + /// True if no error occurred, false otherwise. + public bool SetBrightness(int brightness) { + bool ret = NDalicPINVOKE.SetBrightness(swigCPtr, brightness); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Gets preffered brightness of the window. + /// + /// The preffered brightness. + public int GetBrightness() { + int ret = NDalicPINVOKE.GetBrightness(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + public class WindowFocusChangedEventArgs : EventArgs { public bool FocusGained -- 2.34.1