From a980e143d7cda24225e92fc640b4457bfc1c2075 Mon Sep 17 00:00:00 2001 From: DotnetBuild Date: Thu, 19 Oct 2017 08:27:58 +0900 Subject: [PATCH] Release 4.0.0-preview1-00314 --- packaging/csapi-tizenfx.spec | 4 +- .../Interop/Interop.NotificationEventListener.cs | 3 + .../NotificationListenerManager.cs | 36 +++ .../Interop/Interop.Album.cs | 3 - .../Interop/Interop.Folder.cs | 22 -- .../Interop/Interop.ImageInfo.cs | 3 - .../Interop/Interop.MediaInfo.cs | 30 --- .../Interop/Interop.Playlist.cs | 3 - .../Tizen.Content.MediaContent/Columns.cs | 50 ---- .../Tizen.Content.MediaContent/MediaInfo.cs | 36 --- .../MediaInfoColumnKey.cs | 22 -- .../Tizen.Content.MediaContent/MediaInfoCommand.cs | 43 +--- .../MediaInfoUpdateValues.cs | 73 ------ .../MediaTool/MediaPacketVideoPlane.cs | 2 +- .../src/internal/KeyboardResizedSignalType.cs | 188 +++++++++++++++ .../src/internal/LanguageChangedSignalType.cs | 187 +++++++++++++++ src/Tizen.NUI/src/internal/ManualPINVOKE.cs | 51 ++++ src/Tizen.NUI/src/internal/NDalicPINVOKE.cs | 69 +++++- src/Tizen.NUI/src/internal/SWIGTYPE_p_uint16_t.cs | 40 ++++ .../src/{public => internal}/WebViewLite.cs | 4 +- src/Tizen.NUI/src/internal/WebViewLiteSignal.cs | 2 +- .../src/public/BaseComponents/ImageView.cs | 50 +++- .../src/public/BaseComponents/TextEditor.cs | 20 +- .../src/public/BaseComponents/TextField.cs | 24 +- .../src/public/BaseComponents/TextLabel.cs | 6 +- .../src/public/BaseComponents/VideoView.cs | 40 +++- src/Tizen.NUI/src/public/BaseComponents/View.cs | 74 +++++- src/Tizen.NUI/src/public/Extents.cs | 260 +++++++++++++++++++++ src/Tizen.NUI/src/public/ImfManager.cs | 64 +++-- src/Tizen.NUI/src/public/Layer.cs | 5 +- src/Tizen.NUI/src/public/NUIConstants.cs | 6 +- src/Tizen.NUI/src/public/Property.cs | 31 ++- src/Tizen.NUI/src/public/WidgetView.cs | 47 ++++ src/Tizen.NUI/src/public/Window.cs | 97 ++++---- 34 files changed, 1198 insertions(+), 397 deletions(-) delete mode 100644 src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoUpdateValues.cs create mode 100755 src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs create mode 100755 src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs create mode 100755 src/Tizen.NUI/src/internal/SWIGTYPE_p_uint16_t.cs rename src/Tizen.NUI/src/{public => internal}/WebViewLite.cs (99%) create mode 100755 src/Tizen.NUI/src/public/Extents.cs diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index dce7bc0..2d13b96 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -9,7 +9,7 @@ Name: csapi-tizenfx Summary: Assemblies of Tizen .NET -Version: 4.0.0.309 +Version: 4.0.0.314 Release: 1 Group: Development/Libraries License: Apache-2.0 @@ -144,7 +144,7 @@ rm -fr %{_tizenfx_bin_path} export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true ./build.sh --full ./build.sh --dummy -./build.sh --pack 4.0.0-preview1-00309 +./build.sh --pack 4.0.0-preview1-00314 %install mkdir -p %{buildroot}%{DOTNET_ASSEMBLY_PATH} diff --git a/src/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs b/src/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs index 708a5ad..9e36242 100755 --- a/src/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs +++ b/src/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs @@ -165,6 +165,9 @@ internal static partial class Interop [DllImport(Libraries.NotificationEventListener, EntryPoint = "notification_get_extension_event_handler")] internal static extern ErrorCode GetExtensionAction(NotificationSafeHandle handle, UserEventType type, out SafeAppControlHandle appcontrol); + [DllImport(Libraries.NotificationEventListener, EntryPoint = "notification_load")] + internal static extern IntPtr LoadNotification(string appID, int uniqueID); + internal static ErrorCode GetAppId(NotificationSafeHandle handle, out string appid) { ErrorCode err; diff --git a/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationListenerManager.cs b/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationListenerManager.cs index dd86791..f2c0517 100755 --- a/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationListenerManager.cs +++ b/src/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationListenerManager.cs @@ -422,5 +422,41 @@ namespace Tizen.Applications.NotificationEventListener throw NotificationEventListenerErrorFactory.GetException(err, "failed to send event"); } } + + /// + /// Returns NotificationEventArgs by UniqueNumber. + /// + /// The unique number of the Notification. + /// Thrown in case of an invalid parameter. + /// Thrown in case of a permission is denied. + /// Thrown in case of any internal error. + /// http://tizen.org/privilege/notification + [EditorBrowsable(EditorBrowsableState.Never)] + public static NotificationEventArgs GetNotificationEventArgs(int uniqueNumber) + { + if (uniqueNumber <= 0) + { + throw NotificationEventListenerErrorFactory.GetException(Interop.NotificationEventListener.ErrorCode.InvalidParameter, "Invalid parameter"); + } + + IntPtr notificationPtr = Interop.NotificationEventListener.LoadNotification(null, uniqueNumber); + if (notificationPtr == IntPtr.Zero) + { + int err = Tizen.Internals.Errors.ErrorFacts.GetLastResult(); + if (err.Equals((int)Interop.NotificationEventListener.ErrorCode.DbError)) + { + throw NotificationEventListenerErrorFactory.GetException(Interop.NotificationEventListener.ErrorCode.InvalidParameter, "Not exist"); + } + else + { + throw NotificationEventListenerErrorFactory.GetException((Interop.NotificationEventListener.ErrorCode)err, "failed to get NotificationEventArgs"); + } + } + + NotificationEventArgs eventArgs = new NotificationEventArgs(); + eventArgs = NotificationEventArgsBinder.BindObject(notificationPtr, false); + + return eventArgs; + } } } diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.Album.cs b/src/Tizen.Content.MediaContent/Interop/Interop.Album.cs index 38bece8..61b978c 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.Album.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.Album.cs @@ -31,9 +31,6 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "media_album_destroy")] internal static extern MediaContentError Destroy(IntPtr album); - [DllImport(Libraries.MediaContent, EntryPoint = "media_album_clone")] - internal static extern MediaContentError Clone(out IntPtr dst, IntPtr src); - [DllImport(Libraries.MediaContent, EntryPoint = "media_album_get_album_id")] internal static extern MediaContentError GetId(IntPtr album, out int albumId); diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.Folder.cs b/src/Tizen.Content.MediaContent/Interop/Interop.Folder.cs index dbd9890..af6049e 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.Folder.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.Folder.cs @@ -29,49 +29,27 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_media_count_from_db")] internal static extern MediaContentError GetMediaCountFromDb(string folder_id, FilterHandle filter, out int count); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_clone")] - internal static extern MediaContentError Clone(out IntPtr dst, IntPtr src); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_destroy")] internal static extern MediaContentError Destroy(IntPtr folder); [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_folder_id")] internal static extern MediaContentError GetFolderId(IntPtr folder, out IntPtr folder_id); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_parent_folder_id")] - internal static extern MediaContentError GetParentFolderId(IntPtr folder, out IntPtr parent_folder_id); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_path")] internal static extern MediaContentError GetPath(IntPtr folder, out IntPtr folderPath); [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_name")] internal static extern MediaContentError GetName(IntPtr folder, out IntPtr folder_name); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_modified_time")] - internal static extern MediaContentError GetModifiedTime(IntPtr folder, out IntPtr date); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_storage_type")] internal static extern MediaContentError GetStorageType(IntPtr folder, out StorageType storage_type); [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_storage_id")] internal static extern MediaContentError GetStorageId(IntPtr folder, out IntPtr storage_id); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_order")] - internal static extern MediaContentError GetOrder(IntPtr folder, out int order); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_get_folder_from_db")] internal static extern MediaContentError GetFolderFromDb(string id, out IntPtr folder); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_set_name")] - internal static extern MediaContentError SetName(IntPtr folder, string name); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_set_order")] - internal static extern MediaContentError SetOrder(IntPtr folder, int order); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_update_to_db")] - internal static extern MediaContentError UpdateToDb(IntPtr folder); - [DllImport(Libraries.MediaContent, EntryPoint = "media_folder_foreach_folder_from_db")] internal static extern MediaContentError ForeachFolderFromDb(FilterHandle filter, Common.ItemCallback callback, IntPtr userData = default(IntPtr)); diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs b/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs index ce8caf6..1fadf6d 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.ImageInfo.cs @@ -43,9 +43,6 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_model", CallingConvention = CallingConvention.Cdecl)] internal static extern MediaContentError GetModel(IntPtr handle, out IntPtr model); - [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_media_id", CallingConvention = CallingConvention.Cdecl)] - internal static extern MediaContentError GetMediaId(IntPtr handle, out IntPtr mediaId); - [DllImport(Libraries.MediaContent, EntryPoint = "image_meta_get_width", CallingConvention = CallingConvention.Cdecl)] internal static extern MediaContentError GetWidth(IntPtr handle, out int width); diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs index 296c9a9..fe3bae0 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.MediaInfo.cs @@ -123,30 +123,15 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_altitude")] internal static extern MediaContentError GetAltitude(MediaInfoHandle mediaInformationHandle, out double altitude); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_weather")] - internal static extern MediaContentError GetWeather(MediaInfoHandle mediaInformationHandle, out IntPtr weather); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_rating")] internal static extern MediaContentError GetRating(MediaInfoHandle mediaInformationHandle, out int rating); [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_favorite")] internal static extern MediaContentError GetFavorite(MediaInfoHandle mediaInformationHandle, out bool favorite); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_provider")] - internal static extern MediaContentError GetProvider(MediaInfoHandle mediaInformationHandle, out IntPtr provider); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_title")] internal static extern MediaContentError GetTitle(MediaInfoHandle mediaInformationHandle, out IntPtr title); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_category")] - internal static extern MediaContentError GetCategory(MediaInfoHandle mediaInformationHandle, out IntPtr category); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_location_tag")] - internal static extern MediaContentError GetLocationTag(MediaInfoHandle mediaInformationHandle, out IntPtr locationTag); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_age_rating")] - internal static extern MediaContentError GetAgeRating(MediaInfoHandle mediaInformationHandle, out IntPtr ageRating); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_storage_id")] internal static extern MediaContentError GetStorageId(MediaInfoHandle mediaInformationHandle, out IntPtr storageId); @@ -159,24 +144,9 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "media_info_get_media_from_db")] internal static extern MediaContentError GetMediaFromDB(string mediaId, out MediaInfoHandle handle); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_set_weather")] - internal static extern MediaContentError SetWeather(MediaInfoHandle mediaInformationHandle, string weather); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_set_favorite")] internal static extern MediaContentError SetFavorite(MediaInfoHandle mediaInformationHandle, bool favorite); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_set_provider")] - internal static extern MediaContentError SetProvider(MediaInfoHandle mediaInformationHandle, string provider); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_set_category")] - internal static extern MediaContentError SetCategory(MediaInfoHandle mediaInformationHandle, string category); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_set_location_tag")] - internal static extern MediaContentError SetLocationTag(MediaInfoHandle mediaInformationHandle, string locationTag); - - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_set_age_rating")] - internal static extern MediaContentError SetAgeRating(MediaInfoHandle mediaInformationHandle, string ageRating); - [DllImport(Libraries.MediaContent, EntryPoint = "media_info_update_to_db")] internal static extern MediaContentError UpdateToDB(MediaInfoHandle mediaInformationHandle); diff --git a/src/Tizen.Content.MediaContent/Interop/Interop.Playlist.cs b/src/Tizen.Content.MediaContent/Interop/Interop.Playlist.cs index 4f136eb..0957679 100644 --- a/src/Tizen.Content.MediaContent/Interop/Interop.Playlist.cs +++ b/src/Tizen.Content.MediaContent/Interop/Interop.Playlist.cs @@ -47,9 +47,6 @@ internal static partial class Interop [DllImport(Libraries.MediaContent, EntryPoint = "media_playlist_destroy")] internal static extern MediaContentError Destroy(IntPtr playlist); - [DllImport(Libraries.MediaContent, EntryPoint = "media_playlist_clone")] - internal static extern MediaContentError Clone(out IntPtr dst, IntPtr src); - [DllImport(Libraries.MediaContent, EntryPoint = "media_playlist_get_playlist_id")] internal static extern MediaContentError GetId(IntPtr playlist, out int id); diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs index 135fa38..e0ddf41 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/Columns.cs @@ -410,56 +410,6 @@ namespace Tizen.Content.MediaContent public static string Favorite => "MEDIA_FAVOURITE"; /// - /// Gets the column name for the provider of media. - /// - /// The column name for the provider of media. - /// - /// The value type is string. - /// - /// - public static string Provider => "MEDIA_PROVIDER"; - - /// - /// Gets the column name for the category of media. - /// - /// The column name for the category of media. - /// - /// The value type is string. - /// - /// - public static string Category => "MEDIA_CATEGORY"; - - /// - /// Gets the column name for the location tag of media. - /// - /// The column name for the location tag of media. - /// - /// The value type is string. - /// - /// - public static string LocationTag => "MEDIA_LOCATION_TAG"; - - /// - /// Gets the column name for the age rating of media. - /// - /// The column name for the age rating of media. - /// - /// The value type is string. - /// - /// > - public static string AgeRating => "MEDIA_AGE_RATING"; - - /// - /// Gets the column name for the weather information of media. - /// - /// The column name for the weather information of media. - /// - /// The value type is string. - /// - /// - public static string Weather => "MEDIA_WEATHER"; - - /// /// Gets the column name for the drm of media. /// /// The column name for the drm of media. diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs index b83a6c6..75215e9 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs @@ -23,7 +23,6 @@ namespace Tizen.Content.MediaContent /// Represents the information related to the media stored. /// /// - /// public class MediaInfo { internal MediaInfo(Interop.MediaInfoHandle handle) @@ -50,14 +49,9 @@ namespace Tizen.Content.MediaContent Latitude = InteropHelper.GetValue(handle, Interop.MediaInfo.GetLatitude); Altitude = InteropHelper.GetValue(handle, Interop.MediaInfo.GetAltitude); - Weather = InteropHelper.GetString(handle, Interop.MediaInfo.GetWeather); Rating = InteropHelper.GetValue(handle, Interop.MediaInfo.GetRating); IsFavorite = InteropHelper.GetValue(handle, Interop.MediaInfo.GetFavorite); - Provider = InteropHelper.GetString(handle, Interop.MediaInfo.GetProvider); Title = InteropHelper.GetString(handle, Interop.MediaInfo.GetTitle); - Category = InteropHelper.GetString(handle, Interop.MediaInfo.GetCategory); - LocationTag = InteropHelper.GetString(handle, Interop.MediaInfo.GetLocationTag); - AgeRating = InteropHelper.GetString(handle, Interop.MediaInfo.GetAgeRating); StorageId = InteropHelper.GetString(handle, Interop.MediaInfo.GetStorageId); IsDrm = InteropHelper.GetValue(handle, Interop.MediaInfo.IsDrm); @@ -152,12 +146,6 @@ namespace Tizen.Content.MediaContent public double Altitude { get; } /// - /// Gets the weather information of media. - /// - /// The weather information which a user sets. - public string Weather { get; } - - /// /// Gets the rating of media. /// /// The rating from the metadata. @@ -170,36 +158,12 @@ namespace Tizen.Content.MediaContent public bool IsFavorite { get; } /// - /// Gets the provider of media. - /// - /// The provider which a user sets. - public string Provider { get; } - - /// /// Gets the title of media. /// /// The title of media. public string Title { get; } /// - /// Gets the category of media. - /// - /// The category which a user sets. - public string Category { get; } - - /// - /// Gets the location tag of media. - /// - /// The location tag which a user sets. - public string LocationTag { get; } - - /// - /// Gets the age rating of media. - /// - /// The age rating which a user sets. - public string AgeRating { get; } - - /// /// Gets the storage ID of the storage that the media is stored on. /// /// The storage ID of the storage that the media is stored on. diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs index ff1ba55..a0031ba 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoColumnKey.cs @@ -101,27 +101,5 @@ namespace Tizen.Content.MediaContent /// Rating. /// Rating = 20, - - /// - /// Provider. - /// - Provider = 22, - - /// - /// Category. - /// - Category = 24, - /// - /// Location tag. - /// - LocationTag, - /// - /// Age rating. - /// - AgeRating, - /// - /// Weather. - /// - Weather = 28 } } diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs index 75dd19f..652fabe 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoCommand.cs @@ -622,53 +622,25 @@ namespace Tizen.Content.MediaContent } } - private static void SetUpdateValue(Interop.MediaInfoHandle handle, T value, - Func func) - { - if (value != null) - { - func(handle, value).ThrowIfError("Failed to update"); - } - } - - private static void SetUpdateValue(Interop.MediaInfoHandle handle, Nullable value, - Func func) where T : struct - { - if (value.HasValue) - { - func(handle, value.Value).ThrowIfError("Failed to update"); - } - } - /// - /// Updates the media with the specified values. + /// Updates the media with the favorite value. /// /// http://tizen.org/privilege/content.write /// The media ID to update. - /// The values for update. + /// The value indicating whether the media is favorite. /// true if the matched record was found and updated, otherwise false. - /// Only values set in the are updated. /// The is disconnected. /// The has already been disposed of. /// An error occurred while executing the command. - /// - /// is null.\n - /// -or-\n - /// is null. - /// + /// is null. /// is a zero-length string, contains only white space. /// The caller has no required privilege. - public bool Update(string mediaId, MediaInfoUpdateValues values) + public bool UpdateFavorite(string mediaId, bool value) { ValidateDatabase(); ValidationUtil.ValidateNotNullOrEmpty(mediaId, nameof(mediaId)); - if (values == null) - { - throw new ArgumentNullException(nameof(values)); - } - if (CommandHelper.Count( Interop.MediaInfo.GetMediaCount, $"{MediaInfoColumns.Id}='{mediaId}'") == 0) { @@ -684,12 +656,7 @@ namespace Tizen.Content.MediaContent try { - SetUpdateValue(handle, values.Weather, Interop.MediaInfo.SetWeather); - SetUpdateValue(handle, values.IsFavorite, Interop.MediaInfo.SetFavorite); - SetUpdateValue(handle, values.Provider, Interop.MediaInfo.SetProvider); - SetUpdateValue(handle, values.Category, Interop.MediaInfo.SetCategory); - SetUpdateValue(handle, values.LocationTag, Interop.MediaInfo.SetLocationTag); - SetUpdateValue(handle, values.AgeRating, Interop.MediaInfo.SetAgeRating); + Interop.MediaInfo.SetFavorite(handle, value).ThrowIfError("Failed to update"); Interop.MediaInfo.UpdateToDB(handle).ThrowIfError("Failed to update"); return true; diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoUpdateValues.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoUpdateValues.cs deleted file mode 100644 index 38a528a..0000000 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfoUpdateValues.cs +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using System; - -namespace Tizen.Content.MediaContent -{ - /// - /// Provides means to set values used for the update command. - /// - /// - /// The values only set in the object will be affected to the update command. - /// - /// - public class MediaInfoUpdateValues - { - /// - /// Gets or sets the weather information for an update. - /// - /// If the value is null, the update operation will have no effect on the field. - /// A string for weather; the field will not be updated if null. - public string Weather { get; set; } - - /// - /// Gets or sets the favorite status for an update. - /// - /// If the value is null, the update operation will have no effect on the field. - /// A value indicating whether the media is favorite; the field will not be updated if null. - public bool? IsFavorite { get; set; } - - /// - /// Gets or sets the provider information for an update. - /// - /// If the value is null, the update operation will have no effect on the field. - /// A string for provider; the field will not be updated if null. - public string Provider { get; set; } - - /// - /// Gets or sets the category information for an update. - /// - /// If the value is null, the update operation will have no effect on the field. - /// A string for category; the field will not be updated if null. - public string Category { get; set; } - - - /// - /// Gets or sets the location tag for an update. - /// - /// If the value is null, the update operation will have no effect on the field. - /// A string for location tag; the field will not be updated if null. - public string LocationTag { get; set; } - - /// - /// Gets or sets the age rating information for an update. - /// - /// If the value is null, the update operation will have no effect on the field. - /// A string for age rating; the field will not be updated if null. - public string AgeRating { get; set; } - } -} diff --git a/src/Tizen.Multimedia/MediaTool/MediaPacketVideoPlane.cs b/src/Tizen.Multimedia/MediaTool/MediaPacketVideoPlane.cs index 08025c8..6ab1e9e 100644 --- a/src/Tizen.Multimedia/MediaTool/MediaPacketVideoPlane.cs +++ b/src/Tizen.Multimedia/MediaTool/MediaPacketVideoPlane.cs @@ -41,7 +41,7 @@ namespace Tizen.Multimedia int ret = Interop.MediaPacket.GetVideoStrideWidth(packet.GetHandle(), index, out _strideWidth); MultimediaDebug.AssertNoError(ret); - ret = Interop.MediaPacket.GetVideoStrideWidth(packet.GetHandle(), index, out _strideHeight); + ret = Interop.MediaPacket.GetVideoStrideHeight(packet.GetHandle(), index, out _strideHeight); MultimediaDebug.AssertNoError(ret); Debug.Assert(_strideWidth >= 0 && _strideHeight >= 0, "size must not be negative!"); diff --git a/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs b/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs new file mode 100755 index 0000000..77b2b37 --- /dev/null +++ b/src/Tizen.NUI/src/internal/KeyboardResizedSignalType.cs @@ -0,0 +1,188 @@ +/* + * Copyright(c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +using System; +using System.Runtime.InteropServices; +using System.ComponentModel; + +namespace Tizen.NUI +{ + /// + /// Please do not use! this will be deprecated + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public class KeyboardResizedSignalType : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal KeyboardResizedSignalType(global::System.IntPtr cPtr, bool cMemoryOwn) + { + swigCMemOwn = cMemoryOwn; + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(KeyboardResizedSignalType obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + /// + /// A Flat to check if it is already disposed. + /// + /// 3 + protected bool disposed = false; + + /// + /// Dispose + /// + ~KeyboardResizedSignalType() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + /// + /// Dispose + /// + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + /// + /// Dispose + /// + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicManualPINVOKE.delete_KeyboardResizedSignalType(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + disposed = true; + } + + /// + /// Queries whether there are any connected slots. + /// + /// True if there are any slots connected to the signal + public bool Empty() + { + bool ret = NDalicManualPINVOKE.KeyboardResizedSignalType_Empty(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Queries the number of slots. + /// + /// The number of slots connected to this signal + public uint GetConnectionCount() + { + uint ret = NDalicManualPINVOKE.KeyboardResizedSignalType_GetConnectionCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Connects a function. + /// + /// The function to connect + public void Connect(System.Delegate func) + { + System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicManualPINVOKE.KeyboardResizedSignalType_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + /// + /// Disconnects a function. + /// + /// The function to disconnect + public void Disconnect(System.Delegate func) + { + System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicManualPINVOKE.KeyboardResizedSignalType_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + /// + /// Connects a member function. + /// + /// The member function to connect + public void Emit(int arg) + { + NDalicManualPINVOKE.KeyboardResizedSignalType_Emit(swigCPtr, arg); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// The contructor. + /// + public KeyboardResizedSignalType() : this(NDalicManualPINVOKE.new_KeyboardResizedSignalType(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + } + +} diff --git a/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs b/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs new file mode 100755 index 0000000..37d9961 --- /dev/null +++ b/src/Tizen.NUI/src/internal/LanguageChangedSignalType.cs @@ -0,0 +1,187 @@ +/* + * Copyright(c) 2017 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +using System; +using System.Runtime.InteropServices; +using System.ComponentModel; + +namespace Tizen.NUI +{ + /// + /// Please do not use! this will be deprecated + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public class LanguageChangedSignalType : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal LanguageChangedSignalType(global::System.IntPtr cPtr, bool cMemoryOwn) + { + swigCMemOwn = cMemoryOwn; + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(LanguageChangedSignalType obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + /// + /// A Flat to check if it is already disposed. + /// + /// 3 + protected bool disposed = false; + + /// + /// Dispose + /// + ~LanguageChangedSignalType() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + /// + /// Dispose + /// + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + /// + /// Dispose + /// + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicManualPINVOKE.delete_LanguageChangedSignalType(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + disposed = true; + } + + /// + /// Queries whether there are any connected slots. + /// + /// True if there are any slots connected to the signal + public bool Empty() + { + bool ret = NDalicManualPINVOKE.LanguageChangedSignalType_Empty(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Queries the number of slots. + /// + /// The number of slots connected to this signal + public uint GetConnectionCount() + { + uint ret = NDalicManualPINVOKE.LanguageChangedSignalType_GetConnectionCount(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Connects a member function. + /// + /// The member function to connect + public void Connect(System.Delegate func) + { + System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicManualPINVOKE.LanguageChangedSignalType_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + /// + /// Disconnects a function. + /// + /// The function to disconnect + public void Disconnect(System.Delegate func) + { + System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); + { + NDalicManualPINVOKE.LanguageChangedSignalType_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + } + + /// + /// Emits the signal. + /// + public void Emit(int arg) + { + NDalicManualPINVOKE.LanguageChangedSignalType_Emit(swigCPtr, arg); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// The contructor. + /// + public LanguageChangedSignalType() : this(NDalicManualPINVOKE.new_LanguageChangedSignalType(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + } + +} diff --git a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs index aff59c8..7ac7fdf 100755 --- a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs @@ -577,6 +577,48 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_KeyboardTypeSignalType")] public static extern void delete_KeyboardTypeSignalType(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_LanguageChangedSignalType_Empty")] + public static extern bool LanguageChangedSignalType_Empty(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_LanguageChangedSignalType_GetConnectionCount")] + public static extern uint LanguageChangedSignalType_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_LanguageChangedSignalType_Connect")] + public static extern void LanguageChangedSignalType_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_LanguageChangedSignalType_Disconnect")] + public static extern void LanguageChangedSignalType_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_LanguageChangedSignalType_Emit")] + public static extern void LanguageChangedSignalType_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_LanguageChangedSignalType")] + public static extern global::System.IntPtr new_LanguageChangedSignalType(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_LanguageChangedSignalType")] + public static extern void delete_LanguageChangedSignalType(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyboardResizedSignalType_Empty")] + public static extern bool KeyboardResizedSignalType_Empty(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyboardResizedSignalType_GetConnectionCount")] + public static extern uint KeyboardResizedSignalType_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyboardResizedSignalType_Connect")] + public static extern void KeyboardResizedSignalType_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_KeyboardResizedSignalType_Disconnect")] + public static extern void KeyboardResizedSignalType_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_KeyboardResizedSignalType_Emit")] + public static extern void KeyboardResizedSignalType_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_KeyboardResizedSignalType")] + public static extern global::System.IntPtr new_KeyboardResizedSignalType(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_KeyboardResizedSignalType")] + public static extern void delete_KeyboardResizedSignalType(global::System.Runtime.InteropServices.HandleRef jarg1); + //////////////////////InputMethodOptions [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_InputMethodOptions")] @@ -836,6 +878,12 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WidgetView_Property_PERMANENT_DELETE_get")] public static extern int WidgetView_Property_PERMANENT_DELETE_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WidgetView_Property_RETRY_TEXT_get")] + public static extern int WidgetView_Property_RETRY_TEXT_get(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WidgetView_Property_EFFECT_get")] + public static extern int WidgetView_Property_EFFECT_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_WidgetView_Property")] public static extern global::System.IntPtr new_WidgetView_Property(); @@ -872,6 +920,9 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WidgetView_ActivateFaultedWidget")] public static extern void WidgetView_ActivateFaultedWidget(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WidgetView_TerminateWidget")] + public static extern bool WidgetView_TerminateWidget(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WidgetView_WidgetAddedSignal")] public static extern global::System.IntPtr WidgetView_WidgetAddedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index 0c9d1b4..38992b95 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -1651,10 +1651,13 @@ class NDalicPINVOKE { public static extern global::System.IntPtr new_Property_Value__SWIG_15(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Property_Value__SWIG_16")] - public static extern global::System.IntPtr new_Property_Value__SWIG_16(int jarg1); + public static extern global::System.IntPtr new_Property_Value__SWIG_16(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Property_Value__SWIG_17")] - public static extern global::System.IntPtr new_Property_Value__SWIG_17(global::System.Runtime.InteropServices.HandleRef jarg1); + public static extern global::System.IntPtr new_Property_Value__SWIG_17(int jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Property_Value__SWIG_18")] + public static extern global::System.IntPtr new_Property_Value__SWIG_18(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Assign")] public static extern global::System.IntPtr Property_Value_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); @@ -1707,6 +1710,9 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_14")] public static extern bool Property_Value_Get__SWIG_14(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_15")] + public static extern bool Property_Value_Get__SWIG_15(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_GetArray")] public static extern global::System.IntPtr Property_Value_GetArray(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -7200,6 +7206,12 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_View_Property_BACKGROUND_get")] public static extern int View_Property_BACKGROUND_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_View_Property_MARGIN_get")] + public static extern int View_Property_MARGIN_get(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_View_Property_PADDING_get")] + public static extern int View_Property_PADDING_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_View_Property")] public static extern global::System.IntPtr new_View_Property(); @@ -9683,6 +9695,9 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VideoView_Property_VOLUME_get")] public static extern int VideoView_Property_VOLUME_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_VideoView_Property_UNDERLAY_get")] + public static extern int VideoView_Property_UNDERLAY_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_VideoView_Property")] public static extern global::System.IntPtr new_VideoView_Property(); @@ -11314,6 +11329,54 @@ class NDalicPINVOKE { [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WebViewLite_SWIGUpcast")] public static extern global::System.IntPtr WebViewLite_SWIGUpcast(global::System.IntPtr jarg1); -} + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Extents__SWIG_0")] + public static extern global::System.IntPtr new_Extents__SWIG_0(); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Extents__SWIG_1")] + public static extern global::System.IntPtr new_Extents__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_new_Extents__SWIG_2")] + public static extern global::System.IntPtr new_Extents__SWIG_2(ushort jarg1, ushort jarg2, ushort jarg3, ushort jarg4); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_Assign__SWIG_0")] + public static extern global::System.IntPtr Extents_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_Assign__SWIG_1")] + public static extern global::System.IntPtr Extents_Assign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_EqualTo")] + public static extern bool Extents_EqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_NotEqualTo")] + public static extern bool Extents_NotEqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_start_set")] + public static extern void Extents_start_set(global::System.Runtime.InteropServices.HandleRef jarg1, ushort jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_start_get")] + public static extern ushort Extents_start_get(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_end_set")] + public static extern void Extents_end_set(global::System.Runtime.InteropServices.HandleRef jarg1, ushort jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_end_get")] + public static extern ushort Extents_end_get(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_top_set")] + public static extern void Extents_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, ushort jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_top_get")] + public static extern ushort Extents_top_get(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_bottom_set")] + public static extern void Extents_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, ushort jarg2); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_Extents_bottom_get")] + public static extern ushort Extents_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1); + + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_delete_Extents")] + public static extern void delete_Extents(global::System.Runtime.InteropServices.HandleRef jarg1); + } } diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_uint16_t.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_uint16_t.cs new file mode 100755 index 0000000..26d0d36 --- /dev/null +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_uint16_t.cs @@ -0,0 +1,40 @@ +/* +* Copyright (c) 2017 Samsung Electronics Co., Ltd. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ + +namespace Tizen.NUI +{ + internal class SWIGTYPE_p_uint16_t + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + + internal SWIGTYPE_p_uint16_t(global::System.IntPtr cPtr, bool futureUse) + { + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_uint16_t() + { + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_uint16_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/public/WebViewLite.cs b/src/Tizen.NUI/src/internal/WebViewLite.cs similarity index 99% rename from src/Tizen.NUI/src/public/WebViewLite.cs rename to src/Tizen.NUI/src/internal/WebViewLite.cs index 2a3b96a..e5664c1 100755 --- a/src/Tizen.NUI/src/public/WebViewLite.cs +++ b/src/Tizen.NUI/src/internal/WebViewLite.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + using System; using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; @@ -24,7 +24,7 @@ namespace Tizen.NUI { /// /// WebViewLite. /// -public class WebViewLite : View +internal class WebViewLite : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/WebViewLiteSignal.cs b/src/Tizen.NUI/src/internal/WebViewLiteSignal.cs index e507948..4ea2305 100755 --- a/src/Tizen.NUI/src/internal/WebViewLiteSignal.cs +++ b/src/Tizen.NUI/src/internal/WebViewLiteSignal.cs @@ -20,7 +20,7 @@ namespace Tizen.NUI { /// /// WebViewLiteSignal. /// -public class WebViewLiteSignal : global::System.IDisposable { +internal class WebViewLiteSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; /// diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index 30bcac2..19336cd 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -19,6 +19,7 @@ namespace Tizen.NUI.BaseComponents { using System; using System.Runtime.InteropServices; + using System.ComponentModel; /// /// ImageView is a class for displaying an image resource.
@@ -102,7 +103,7 @@ namespace Tizen.NUI.BaseComponents private void OnResourceReady(IntPtr data) { ResourceReadyEventArgs e = new ResourceReadyEventArgs(); - if(data != null) + if (data != null) { e.View = Registry.GetManagedBaseHandleFromNativePtr(data) as View; } @@ -125,7 +126,7 @@ namespace Tizen.NUI.BaseComponents return; } - if(type == DisposeTypes.Explicit) + if (type == DisposeTypes.Explicit) { //Called by User //Release your own managed resources here. @@ -195,7 +196,7 @@ namespace Tizen.NUI.BaseComponents [Obsolete("Please do not use! this will be deprecated")] public new static ImageView DownCast(BaseHandle handle) { - ImageView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as ImageView; + ImageView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as ImageView; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -218,7 +219,8 @@ namespace Tizen.NUI.BaseComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal ViewResourceReadySignal ResourceReadySignal(View view) { + internal ViewResourceReadySignal ResourceReadySignal(View view) + { ViewResourceReadySignal ret = new ViewResourceReadySignal(NDalicPINVOKE.ResourceReadySignal(View.getCPtr(view)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -230,7 +232,7 @@ namespace Tizen.NUI.BaseComponents /// True if the resources are loaded and ready, false otherwise.
/// /// 3 - public new bool IsResourceReady() + public new bool IsResourceReady() { bool ret = NDalicPINVOKE.IsResourceReady(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -246,7 +248,7 @@ namespace Tizen.NUI.BaseComponents { get { - GetProperty(ImageView.Property.RESOURCE_URL).Get(out _url); + GetProperty(ImageView.Property.IMAGE).Get(out _url); return _url; } set @@ -257,9 +259,11 @@ namespace Tizen.NUI.BaseComponents } /// - /// ImageView ImageMap, type PropertyMap: string if it is a URL, map otherwise + /// This will be deprecated, please use Image instead.
+ /// ImageView ImageMap, type PropertyMap: string if it is a URL, map otherwise. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] public PropertyMap ImageMap { get @@ -285,6 +289,34 @@ namespace Tizen.NUI.BaseComponents } /// + /// ImageView Image, type PropertyMap + /// + /// 4 + public PropertyMap Image + { + get + { + if (_border == null) + { + PropertyMap temp = new PropertyMap(); + GetProperty(ImageView.Property.IMAGE).Get(temp); + return temp; + } + else + { + return null; + } + } + set + { + if (_border == null) + { + SetProperty(ImageView.Property.IMAGE, new Tizen.NUI.PropertyValue(value)); + } + } + } + + /// /// ImageView PreMultipliedAlpha, type Boolean.
/// Image must be initialized.
/// @@ -393,7 +425,7 @@ namespace Tizen.NUI.BaseComponents if (_synchronousLoading != null) _nPatchMap.Add(NpatchImageVisualProperty.SynchronousLoading, new PropertyValue((bool)_synchronousLoading)); SetProperty(ImageView.Property.IMAGE, new PropertyValue(_nPatchMap)); } - else if(_synchronousLoading != null) + else if (_synchronousLoading != null) { // for normal image, with synchronous loading property PropertyMap imageMap = new PropertyMap(); imageMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image)); @@ -403,7 +435,7 @@ namespace Tizen.NUI.BaseComponents } else { // just for normal image - SetProperty(ImageView.Property.RESOURCE_URL, new PropertyValue(_url)); + SetProperty(ImageView.Property.IMAGE, new PropertyValue(_url)); } } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 66b5eda..0f69905 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -1151,12 +1151,12 @@ namespace Tizen.NUI.BaseComponents /// The Outline property. /// /// 3 - public string Outline + public PropertyMap Outline { get { - string temp; - GetProperty(TextEditor.Property.OUTLINE).Get(out temp); + PropertyMap temp = new PropertyMap(); + GetProperty(TextEditor.Property.OUTLINE).Get(temp); return temp; } set @@ -1367,17 +1367,17 @@ namespace Tizen.NUI.BaseComponents /// The following example demonstrates how to set the placeholder property. /// /// PropertyMap propertyMap = new PropertyMap(); - /// propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text")); - /// propertyMap.Add("placeholderTextFocused", new PropertyValue("Setting Placeholder Text Focused")); - /// propertyMap.Add("placeholderColor", new PropertyValue(Color.Red)); - /// propertyMap.Add("placeholderFontFamily", new PropertyValue("Arial")); - /// propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f)); + /// propertyMap.Add("text", new PropertyValue("Setting Placeholder Text")); + /// propertyMap.Add("textFocused", new PropertyValue("Setting Placeholder Text Focused")); + /// propertyMap.Add("color", new PropertyValue(Color.Red)); + /// propertyMap.Add("fontFamily", new PropertyValue("Arial")); + /// propertyMap.Add("pointSize", new PropertyValue(12.0f)); /// /// PropertyMap fontStyleMap = new PropertyMap(); /// fontStyleMap.Add("weight", new PropertyValue("bold")); /// fontStyleMap.Add("width", new PropertyValue("condensed")); /// fontStyleMap.Add("slant", new PropertyValue("italic")); - /// propertyMap.Add("placeholderFontStyle", new PropertyValue(fontStyleMap)); + /// propertyMap.Add("fontStyle", new PropertyValue(fontStyleMap)); /// /// TextEditor editor = new TextEditor(); /// editor.Placeholder = propertyMap; @@ -1444,4 +1444,4 @@ namespace Tizen.NUI.BaseComponents } -} \ No newline at end of file +} diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index 0f31a23..d9b7128 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -53,7 +53,7 @@ namespace Tizen.NUI.BaseComponents return; } - if(type == DisposeTypes.Explicit) + if (type == DisposeTypes.Explicit) { //Called by User //Release your own managed resources here. @@ -320,7 +320,7 @@ namespace Tizen.NUI.BaseComponents [Obsolete("Please do not use! this will be deprecated")] public new static TextField DownCast(BaseHandle handle) { - TextField ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as TextField; + TextField ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as TextField; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -1302,12 +1302,12 @@ namespace Tizen.NUI.BaseComponents /// The Outline property. /// /// 3 - public string Outline + public PropertyMap Outline { get { - string temp; - GetProperty(TextField.Property.OUTLINE).Get(out temp); + PropertyMap temp = new PropertyMap(); + GetProperty(TextField.Property.OUTLINE).Get(temp); return temp; } set @@ -1396,17 +1396,17 @@ namespace Tizen.NUI.BaseComponents /// The following example demonstrates how to set the Placeholder property. /// /// PropertyMap propertyMap = new PropertyMap(); - /// propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text")); - /// propertyMap.Add("placeholderTextFocused", new PropertyValue("Setting Placeholder Text Focused")); - /// propertyMap.Add("placeholderColor", new PropertyValue(Color.Red)); - /// propertyMap.Add("placeholderFontFamily", new PropertyValue("Arial")); - /// propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f)); + /// propertyMap.Add("text", new PropertyValue("Setting Placeholder Text")); + /// propertyMap.Add("textFocused", new PropertyValue("Setting Placeholder Text Focused")); + /// propertyMap.Add("color", new PropertyValue(Color.Red)); + /// propertyMap.Add("fontFamily", new PropertyValue("Arial")); + /// propertyMap.Add("pointSize", new PropertyValue(12.0f)); /// /// PropertyMap fontStyleMap = new PropertyMap(); /// fontStyleMap.Add("weight", new PropertyValue("bold")); /// fontStyleMap.Add("width", new PropertyValue("condensed")); /// fontStyleMap.Add("slant", new PropertyValue("italic")); - /// propertyMap.Add("placeholderFontStyle", new PropertyValue(fontStyleMap)); + /// propertyMap.Add("fontStyle", new PropertyValue(fontStyleMap)); /// /// TextField field = new TextField(); /// field.Placeholder = propertyMap; @@ -1450,4 +1450,4 @@ namespace Tizen.NUI.BaseComponents } -} \ No newline at end of file +} diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index e87c082..a166155 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -692,12 +692,12 @@ namespace Tizen.NUI.BaseComponents /// The default outline parameters.
/// /// 3 - public string Outline + public PropertyMap Outline { get { - string temp; - GetProperty(TextLabel.Property.OUTLINE).Get(out temp); + PropertyMap temp = new PropertyMap(); + GetProperty(TextLabel.Property.OUTLINE).Get(temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs index 974dd9b..43e1d64 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs @@ -157,6 +157,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get(); internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get(); internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get(); + internal static readonly int UNDERLAY = NDalicPINVOKE.VideoView_Property_UNDERLAY_get(); } /// @@ -258,7 +259,7 @@ namespace Tizen.NUI.BaseComponents } /// - /// Video file URL as string type or PropertyMap. + /// Video file setting type of PropertyMap. /// /// 3 public PropertyMap Video @@ -329,6 +330,43 @@ namespace Tizen.NUI.BaseComponents } } + /// + /// Video rendering by underlay, true or false.
+ /// This shows video composited underneath the window by the system. This means it may ignore rotation of the video-view. + /// + /// 4 + public bool Underlay + { + get + { + bool temp = false; + GetProperty(VideoView.Property.UNDERLAY).Get(out temp); + return temp; + } + set + { + SetProperty(VideoView.Property.UNDERLAY, new PropertyValue(value)); + } + } + + /// + /// Video file URL as string type. + /// + /// 4 + public string ResourceUrl + { + get + { + string tmp; + GetProperty(VideoView.Property.VIDEO).Get(out tmp); + return tmp; + } + set + { + SetProperty(VideoView.Property.VIDEO, new PropertyValue(value)); + } + } + } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 02ff6ba..f312226 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -1097,6 +1097,8 @@ namespace Tizen.NUI.BaseComponents internal static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get(); internal static readonly int INHERIT_LAYOUT_DIRECTION = NDalicManualPINVOKE.Actor_Property_INHERIT_LAYOUT_DIRECTION_get(); internal static readonly int LAYOUT_DIRECTION = NDalicManualPINVOKE.Actor_Property_LAYOUT_DIRECTION_get(); + internal static readonly int MARGIN = NDalicPINVOKE.View_Property_MARGIN_get(); + internal static readonly int PADDINGEX = NDalicPINVOKE.View_Property_PADDING_get(); } /// @@ -1912,7 +1914,14 @@ namespace Tizen.NUI.BaseComponents } set { - LeftFocusableViewId = (int)value.GetId(); + if(value) + { + LeftFocusableViewId = (int)value.GetId(); + } + else + { + LeftFocusableViewId = -1; + } } } @@ -1935,7 +1944,14 @@ namespace Tizen.NUI.BaseComponents } set { - RightFocusableViewId = (int)value.GetId(); + if(value) + { + RightFocusableViewId = (int)value.GetId(); + } + else + { + RightFocusableViewId = -1; + } } } @@ -1958,7 +1974,14 @@ namespace Tizen.NUI.BaseComponents } set { - UpFocusableViewId = (int)value.GetId(); + if(value) + { + UpFocusableViewId = (int)value.GetId(); + } + else + { + UpFocusableViewId = -1; + } } } @@ -1981,7 +2004,14 @@ namespace Tizen.NUI.BaseComponents } set { - DownFocusableViewId = (int)value.GetId(); + if(value) + { + DownFocusableViewId = (int)value.GetId(); + } + else + { + DownFocusableViewId = -1; + } } } @@ -4424,6 +4454,40 @@ namespace Tizen.NUI.BaseComponents SetProperty(View.Property.LAYOUT_DIRECTION, new Tizen.NUI.PropertyValue((int)value)); } } + + /// + /// Gets or sets the Margin for use in layout. + /// + public Extents Margin + { + get + { + Extents temp = new Extents(0, 0, 0, 0); + GetProperty(View.Property.MARGIN).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.MARGIN, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets or sets the Padding for use in layout. + /// + public Extents PaddingEX + { + get + { + Extents temp = new Extents(0, 0, 0, 0); + GetProperty(View.Property.PADDINGEX).Get(temp); + return temp; + } + set + { + SetProperty(View.Property.PADDINGEX, new Tizen.NUI.PropertyValue(value)); + } + } } /// @@ -4441,4 +4505,4 @@ namespace Tizen.NUI.BaseComponents /// RTL } -} \ No newline at end of file +} diff --git a/src/Tizen.NUI/src/public/Extents.cs b/src/Tizen.NUI/src/public/Extents.cs new file mode 100755 index 0000000..f5dc8e7 --- /dev/null +++ b/src/Tizen.NUI/src/public/Extents.cs @@ -0,0 +1,260 @@ +/* +* Copyright (c) 2017 Samsung Electronics Co., Ltd. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ + +namespace Tizen.NUI +{ + /// + /// Extents class describing the a collection of uint16_t. + /// + public class Extents : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal Extents(global::System.IntPtr cPtr, bool cMemoryOwn) + { + swigCMemOwn = cMemoryOwn; + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Extents obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + //A Flag to check who called Dispose(). (By User or DisposeQueue) + private bool isDisposeQueued = false; + //A Flat to check if it is already disposed. + protected bool disposed = false; + + /// + /// Destructor. + /// + /// 4 + ~Extents() + { + if (!isDisposeQueued) + { + isDisposeQueued = true; + DisposeQueue.Instance.Add(this); + } + } + + /// + /// To make a Extents instance be disposed. + /// + /// 4 + public void Dispose() + { + //Throw excpetion if Dispose() is called in separate thread. + if (!Window.IsInstalled()) + { + throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); + } + + if (isDisposeQueued) + { + Dispose(DisposeTypes.Implicit); + } + else + { + Dispose(DisposeTypes.Explicit); + System.GC.SuppressFinalize(this); + } + } + + protected virtual void Dispose(DisposeTypes type) + { + if (disposed) + { + return; + } + + if (type == DisposeTypes.Explicit) + { + //Called by User + //Release your own managed resources here. + //You should release all of your own disposable objects here. + } + + //Release your own unmanaged resources here. + //You should not access any managed member here except static instance. + //because the execution order of Finalizes is non-deterministic. + + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicPINVOKE.delete_Extents(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + disposed = true; + } + + /// + /// Constructor. + /// + /// 4 + public Extents() : this(NDalicPINVOKE.new_Extents__SWIG_0(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Constructor. + /// + /// A reference to the copied Extents. + /// 4 + public Extents(Extents copy) : this(NDalicPINVOKE.new_Extents__SWIG_1(Extents.getCPtr(copy)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Constructor. + /// Start extent. + /// End extent. + /// Top extent. + /// Bottom extent. + /// + /// 4 + public Extents(ushort start, ushort end, ushort top, ushort bottom) : this(NDalicPINVOKE.new_Extents__SWIG_2(start, end, top, bottom), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + internal Extents Assign(SWIGTYPE_p_uint16_t array) + { + Extents ret = new Extents(NDalicPINVOKE.Extents_Assign__SWIG_1(swigCPtr, SWIGTYPE_p_uint16_t.getCPtr(array)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + internal Extents Assign(Extents copy) + { + Extents ret = new Extents(NDalicPINVOKE.Extents_Assign__SWIG_0(swigCPtr, Extents.getCPtr(copy)), false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Equality operator. + /// + /// The Extents to test against. + /// True if the extents are not equal. + /// 4 + public bool EqualTo(Extents rhs) + { + bool ret = NDalicPINVOKE.Extents_EqualTo(swigCPtr, Extents.getCPtr(rhs)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Inequality operator. + /// + /// The Extents to test against. + /// True if the extents are not equal. + /// 4 + public bool NotEqualTo(Extents rhs) + { + bool ret = NDalicPINVOKE.Extents_NotEqualTo(swigCPtr, Extents.getCPtr(rhs)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// The Start extent. + /// + /// 4 + public ushort Start + { + set + { + NDalicPINVOKE.Extents_start_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ushort ret = NDalicPINVOKE.Extents_start_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// The End extend. + /// + /// 4 + public ushort End + { + set + { + NDalicPINVOKE.Extents_end_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ushort ret = NDalicPINVOKE.Extents_end_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// The Top extend. + /// + /// 4 + public ushort Top + { + set + { + NDalicPINVOKE.Extents_top_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ushort ret = NDalicPINVOKE.Extents_top_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// The Bottom Extend. + /// + /// 4 + public ushort Bottom + { + set + { + NDalicPINVOKE.Extents_bottom_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + ushort ret = NDalicPINVOKE.Extents_bottom_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + } + +} diff --git a/src/Tizen.NUI/src/public/ImfManager.cs b/src/Tizen.NUI/src/public/ImfManager.cs index 79cbe73..40b908b 100755 --- a/src/Tizen.NUI/src/public/ImfManager.cs +++ b/src/Tizen.NUI/src/public/ImfManager.cs @@ -1486,15 +1486,30 @@ namespace Tizen.NUI } } - private delegate void ResizedEventCallbackType(); + /// + /// ImfManager resized event. + /// + public class ResizedEventArgs : EventArgs + { + /// + /// resized. + /// + public int Resized + { + get; + set; + } + } + + private delegate void ResizedEventCallbackType(int resized); private ResizedEventCallbackType _resizedEventCallback; - private event EventHandler _resizedEventHandler; + private event EventHandler _resizedEventHandler; /// /// ImfManager resized. /// /// 4 - public event EventHandler Resized + public event EventHandler Resized { add { @@ -1517,11 +1532,14 @@ namespace Tizen.NUI } } - private void OnResized() + private void OnResized(int resized) { + ResizedEventArgs e = new ResizedEventArgs(); + e.Resized = resized; + if (_resizedEventHandler != null) { - _resizedEventHandler(this, null); + _resizedEventHandler(this, e); } } @@ -1530,9 +1548,9 @@ namespace Tizen.NUI /// //Please do not use! this will be internal [EditorBrowsable(EditorBrowsableState.Never)] - public ImfVoidSignalType ResizedSignal() + public KeyboardResizedSignalType ResizedSignal() { - ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr), false); + KeyboardResizedSignalType ret = new KeyboardResizedSignalType(NDalicManualPINVOKE.ImfManager_ResizedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -1602,15 +1620,30 @@ namespace Tizen.NUI } } - private delegate void LanguageChangedEventCallbackType(); + /// + /// ImfManager language changed event args. + /// + public class LanguageChangedEventArgs : EventArgs + { + /// + /// language changed. + /// + public int LanguageChanged + { + get; + set; + } + } + + private delegate void LanguageChangedEventCallbackType(int languageChanged); private LanguageChangedEventCallbackType _languageChangedEventCallback; - private event EventHandler _languageChangedEventHandler; + private event EventHandler _languageChangedEventHandler; /// /// ImfManager language changed. /// /// 4 - public event EventHandler LanguageChanged + public event EventHandler LanguageChanged { add { @@ -1633,11 +1666,14 @@ namespace Tizen.NUI } } - private void OnLanguageChanged() + private void OnLanguageChanged(int languageChanged) { + LanguageChangedEventArgs e = new LanguageChangedEventArgs(); + e.LanguageChanged = languageChanged; + if (_languageChangedEventHandler != null) { - _languageChangedEventHandler(this, null); + _languageChangedEventHandler(this, e); } } @@ -1646,9 +1682,9 @@ namespace Tizen.NUI /// //Please do not use! this will be internal [EditorBrowsable(EditorBrowsableState.Never)] - public ImfVoidSignalType LanguageChangedSignal() + public LanguageChangedSignalType LanguageChangedSignal() { - ImfVoidSignalType ret = new ImfVoidSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr), false); + LanguageChangedSignalType ret = new LanguageChangedSignalType(NDalicManualPINVOKE.ImfManager_LanguageChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index 94e8eef..e7f3391 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -516,10 +516,7 @@ namespace Tizen.NUI { get { - uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + return Convert.ToUInt32(Children.Count); } } diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index a87c3a3..c19f0e4 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -436,7 +436,11 @@ namespace Tizen.NUI /// /// A string key to PropertyValue mapping. /// - Map + Map, + /// + /// An extents type. + /// + Extents } /// diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs index 9423f47..2bdc339 100755 --- a/src/Tizen.NUI/src/public/Property.cs +++ b/src/Tizen.NUI/src/public/Property.cs @@ -1340,6 +1340,10 @@ namespace Tizen.NUI { value = new PropertyValue((RelativeVector4)obj); } + else if(type.Equals(typeof(Extents))) + { + value = new PropertyValue((Extents)obj); + } else { throw new global::System.InvalidOperationException("Unimplemented type for Property Value :" + type.Name); @@ -1594,11 +1598,21 @@ namespace Tizen.NUI } /// + /// Creates a Extents value. + /// + /// A Extents value. + /// 4 + public PropertyValue(Extents extentsValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_16(Extents.getCPtr(extentsValue)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// /// Creates a PropertyType value. /// /// A PropertyType value. /// 3 - public PropertyValue(PropertyType type) : this(NDalicPINVOKE.new_Property_Value__SWIG_16((int)type), true) + public PropertyValue(PropertyType type) : this(NDalicPINVOKE.new_Property_Value__SWIG_17((int)type), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1608,7 +1622,7 @@ namespace Tizen.NUI /// /// A PropertyValue value. /// 3 - public PropertyValue(PropertyValue value) : this(NDalicPINVOKE.new_Property_Value__SWIG_17(PropertyValue.getCPtr(value)), true) + public PropertyValue(PropertyValue value) : this(NDalicPINVOKE.new_Property_Value__SWIG_18(PropertyValue.getCPtr(value)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1788,5 +1802,18 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } + + /// + /// Retrieves a Extents value. + /// + /// On return, a extents. + /// Returns true if the value is successfully retrieved, false if the type is not convertible. + /// 4 + public bool Get(Extents extentsValue) + { + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_15(swigCPtr, Extents.getCPtr(extentsValue)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/WidgetView.cs b/src/Tizen.NUI/src/public/WidgetView.cs index a0f6bbf..b97177f 100755 --- a/src/Tizen.NUI/src/public/WidgetView.cs +++ b/src/Tizen.NUI/src/public/WidgetView.cs @@ -93,6 +93,8 @@ namespace Tizen.NUI internal static readonly int LOADING_TEXT = NDalicManualPINVOKE.WidgetView_Property_LOADING_TEXT_get(); internal static readonly int WIDGET_STATE_FAULTED = NDalicManualPINVOKE.WidgetView_Property_WIDGET_STATE_FAULTED_get(); internal static readonly int PERMANENT_DELETE = NDalicManualPINVOKE.WidgetView_Property_PERMANENT_DELETE_get(); + internal static readonly int RETRY_TEXT = NDalicManualPINVOKE.WidgetView_Property_RETRY_TEXT_get(); + internal static readonly int EFFECT = NDalicManualPINVOKE.WidgetView_Property_EFFECT_get(); } /// @@ -504,6 +506,17 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } + /// + /// Terminate a widget instance. + /// + /// True on success, false otherwise + public bool TerminateWidget() + { + bool ret = NDalicManualPINVOKE.WidgetView_TerminateWidget(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + internal WidgetViewSignal WidgetAddedSignal() { WidgetViewSignal ret = new WidgetViewSignal(NDalicManualPINVOKE.WidgetView_WidgetAddedSignal(swigCPtr), false); @@ -688,6 +701,40 @@ namespace Tizen.NUI } } + /// + /// Gets or sets retry text. + /// + public PropertyMap RetryText + { + get + { + PropertyMap temp = new PropertyMap(); + GetProperty(WidgetView.Property.RETRY_TEXT).Get(temp); + return temp; + } + set + { + SetProperty(WidgetView.Property.RETRY_TEXT, new Tizen.NUI.PropertyValue(value)); + } + } + + /// + /// Gets or sets effect. + /// + public PropertyMap Effect + { + get + { + PropertyMap temp = new PropertyMap(); + GetProperty(WidgetView.Property.EFFECT).Get(temp); + return temp; + } + set + { + SetProperty(WidgetView.Property.EFFECT, new Tizen.NUI.PropertyValue(value)); + } + } + } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index ace40de..233e1e2 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -53,12 +53,12 @@ namespace Tizen.NUI /// protected override void Dispose(DisposeTypes type) { - if(disposed) + if (disposed) { return; } - if(type == DisposeTypes.Explicit) + if (type == DisposeTypes.Explicit) { //Called by User //Release your own managed resources here. @@ -140,12 +140,12 @@ namespace Tizen.NUI return ret; } - internal static bool IsInstalled() - { + internal static bool IsInstalled() + { bool ret = NDalicPINVOKE.Stage_IsInstalled(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; - } + } /// /// Sets whether the window accepts a focus or not. @@ -208,7 +208,8 @@ namespace Tizen.NUI /// /// The number of supported auxiliary hints. /// 3 - public uint GetSupportedAuxiliaryHintCount() { + public uint GetSupportedAuxiliaryHintCount() + { uint ret = NDalicPINVOKE.GetSupportedAuxiliaryHintCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -220,7 +221,8 @@ namespace Tizen.NUI /// The index of the supported auxiliary hint lists. /// The auxiliary hint string of the index. /// 3 - public string GetSupportedAuxiliaryHint(uint index) { + public string GetSupportedAuxiliaryHint(uint index) + { string ret = NDalicPINVOKE.GetSupportedAuxiliaryHint(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -233,7 +235,8 @@ namespace Tizen.NUI /// The value string. /// The ID of created auxiliary hint, or 0 on failure. /// 3 - public uint AddAuxiliaryHint(string hint, string value) { + public uint AddAuxiliaryHint(string hint, string value) + { uint ret = NDalicPINVOKE.AddAuxiliaryHint(swigCPtr, hint, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -245,7 +248,8 @@ namespace Tizen.NUI /// The ID of the auxiliary hint. /// True if no error occurred, false otherwise. /// 3 - public bool RemoveAuxiliaryHint(uint id) { + public bool RemoveAuxiliaryHint(uint id) + { bool ret = NDalicPINVOKE.RemoveAuxiliaryHint(swigCPtr, id); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -258,7 +262,8 @@ namespace Tizen.NUI /// The value string to be set. /// True if no error occurred, false otherwise. /// 3 - public bool SetAuxiliaryHintValue(uint id, string value) { + public bool SetAuxiliaryHintValue(uint id, string value) + { bool ret = NDalicPINVOKE.SetAuxiliaryHintValue(swigCPtr, id, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -270,7 +275,8 @@ namespace Tizen.NUI /// The auxiliary hint ID. /// The string value of the auxiliary hint ID, or an empty string if none exists. /// 3 - public string GetAuxiliaryHintValue(uint id) { + public string GetAuxiliaryHintValue(uint id) + { string ret = NDalicPINVOKE.GetAuxiliaryHintValue(swigCPtr, id); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -282,7 +288,8 @@ namespace Tizen.NUI /// The auxiliary hint string. /// The ID of auxiliary hint string, or 0 on failure. /// 3 - public uint GetAuxiliaryHintId(string hint) { + public uint GetAuxiliaryHintId(string hint) + { uint ret = NDalicPINVOKE.GetAuxiliaryHintId(swigCPtr, hint); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -293,7 +300,8 @@ namespace Tizen.NUI /// /// The region to accept input events. /// 3 - public void SetInputRegion(Rectangle inputRegion) { + public void SetInputRegion(Rectangle inputRegion) + { NDalicPINVOKE.SetInputRegion(swigCPtr, Rectangle.getCPtr(inputRegion)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -323,7 +331,8 @@ namespace Tizen.NUI /// The notification window level. /// True if no error occurred, false otherwise. /// 3 - public bool SetNotificationLevel(NotificationLevel level) { + public bool SetNotificationLevel(NotificationLevel level) + { bool ret = NDalicPINVOKE.SetNotificationLevel(swigCPtr, (int)level); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -334,7 +343,8 @@ namespace Tizen.NUI /// /// The notification window level. /// 3 - public NotificationLevel GetNotificationLevel() { + public NotificationLevel GetNotificationLevel() + { NotificationLevel ret = (NotificationLevel)NDalicPINVOKE.GetNotificationLevel(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -345,7 +355,8 @@ namespace Tizen.NUI /// /// Whether the window's visual state is opaque. /// 3 - public void SetOpaqueState(bool opaque) { + public void SetOpaqueState(bool opaque) + { NDalicPINVOKE.SetOpaqueState(swigCPtr, opaque); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -355,7 +366,8 @@ namespace Tizen.NUI /// /// True if the window's visual state is opaque, false otherwise. /// 3 - public bool IsOpaqueState() { + public bool IsOpaqueState() + { bool ret = NDalicPINVOKE.IsOpaqueState(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -367,7 +379,8 @@ namespace Tizen.NUI /// The screen mode. /// True if no error occurred, false otherwise. /// 3 - public bool SetScreenOffMode(ScreenOffMode screenOffMode) { + public bool SetScreenOffMode(ScreenOffMode screenOffMode) + { bool ret = NDalicPINVOKE.SetScreenOffMode(swigCPtr, (int)screenOffMode); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -378,7 +391,8 @@ namespace Tizen.NUI /// /// The screen off mode. /// 3 - public ScreenOffMode GetScreenOffMode() { + public ScreenOffMode GetScreenOffMode() + { ScreenOffMode ret = (ScreenOffMode)NDalicPINVOKE.GetScreenOffMode(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -390,7 +404,8 @@ namespace Tizen.NUI /// The preferred brightness (0 to 100). /// True if no error occurred, false otherwise. /// 3 - public bool SetBrightness(int brightness) { + public bool SetBrightness(int brightness) + { bool ret = NDalicPINVOKE.SetBrightness(swigCPtr, brightness); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -401,7 +416,8 @@ namespace Tizen.NUI /// /// The preferred brightness. /// 3 - public int GetBrightness() { + public int GetBrightness() + { int ret = NDalicPINVOKE.GetBrightness(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -480,7 +496,7 @@ namespace Tizen.NUI set { _windowTitle = value; - SetClass( _windowTitle, "" ); + SetClass(_windowTitle, ""); } } @@ -707,7 +723,7 @@ namespace Tizen.NUI if (_rootLayer == null && Window.IsInstalled()) { _rootLayer = new Layer(NDalicPINVOKE.Stage_GetRootLayer(stageCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } return _rootLayer; } @@ -1418,7 +1434,7 @@ namespace Tizen.NUI internal void SetPosition(Position2D position) { - var val = new Uint16Pair( (uint)position.X, (uint)position.Y ); + var val = new Uint16Pair((uint)position.X, (uint)position.Y); NDalicManualPINVOKE.SetPosition(swigCPtr, Uint16Pair.getCPtr(val)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -1629,21 +1645,23 @@ namespace Tizen.NUI } /// - /// Contains and encapsulates Native Ecore Wayland Window handle. + /// Contains and encapsulates Native Window handle. /// - /// - /// To get System.IntPtr of Native Ecore Wayland Window handle,
- /// DangerousGetHandle() method is used to get handle. - /// /// 4 - public class NativeWindowSafeHandle : SafeHandle + public class SafeNativeWindowHandle : SafeHandle { - internal NativeWindowSafeHandle(IntPtr handle) : base(handle, true) + /// + /// Contructor, Native window handle is set to handle. + /// + /// 4 + public SafeNativeWindowHandle() : base(IntPtr.Zero, false) { + SetHandle(Tizen.NUI.Window.Instance.GetNativeWindowHandler()); } /// /// Null check if the handle is valid or not. /// + /// 4 public override bool IsInvalid { get @@ -1658,24 +1676,9 @@ namespace Tizen.NUI /// 4 protected override bool ReleaseHandle() { - this.SetHandle(IntPtr.Zero); return true; } } - /// - /// Gets Native Ecore Wayland Window handle. - /// - /// - /// NativeWindowSafeHandle class contains System.IntPtr of Native Ecore Wayland Window handle,
- /// DangerousGetHandle() method is used to get handle. - /// - /// 4 - public Window.NativeWindowSafeHandle NativeWindowHandle - { - get - { - return new NativeWindowSafeHandle(GetNativeWindowHandler()); - } - } + } } -- 2.7.4